diff --git a/Dockerfile.allinone b/Dockerfile.allinone index 397e64c..5f411d3 100644 --- a/Dockerfile.allinone +++ b/Dockerfile.allinone @@ -53,6 +53,6 @@ COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY docker/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh -EXPOSE 6969 +EXPOSE 80 ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 204d3da..0493261 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -19,5 +19,10 @@ fi # ── Ensure supervisor log directory exists ──────────────────────────────────── mkdir -p /var/log/supervisor +# ── Defaults for all-in-one local PostgreSQL ───────────────────────────────── +export SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://localhost:5432/condado} +export SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-condado} +export SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-condado} + # ── Start all services via supervisord ─────────────────────────────────────── exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf diff --git a/docker/supervisord.conf b/docker/supervisord.conf index f2d745c..7435fca 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -13,7 +13,6 @@ stderr_logfile=/var/log/supervisor/postgres.err.log [program:backend] command=java -jar /app/app.jar -environment=SPRING_DATASOURCE_URL="jdbc:postgresql://localhost:5432/condado",SPRING_DATASOURCE_USERNAME="condado",SPRING_DATASOURCE_PASSWORD="condado" autostart=true autorestart=true startsecs=15 diff --git a/nginx/nginx.allinone.conf b/nginx/nginx.allinone.conf index cb1910f..2a308a4 100644 --- a/nginx/nginx.allinone.conf +++ b/nginx/nginx.allinone.conf @@ -16,7 +16,7 @@ http { text/xml application/xml application/xml+rss text/javascript; server { - listen 6969; + listen 80; server_name _; root /usr/share/nginx/html;