From 8f508034d5e5836c7b3af5694319a442345beeec Mon Sep 17 00:00:00 2001 From: Gabriel Sancho Date: Sat, 28 Mar 2026 03:32:08 -0300 Subject: [PATCH] fix: update Docker configuration for image source and enhance logging in supervisord --- docker-compose.prod.yml | 2 +- docker/entrypoint.sh | 14 ++++++++++++++ docker/supervisord.conf | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 0ee154b..ce7042d 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,6 +1,6 @@ services: condado-newsletter: - image: sancho41/condado-newsletter:latest + image: gitea.lab:80/sancho41/condado-newsletter:latest container_name: condado-newsletter restart: unless-stopped environment: diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 6a6f2c1..3eb01b5 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -28,5 +28,19 @@ export SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://localhos export SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-${APP_DB_USER}} export SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-${APP_DB_PASSWORD}} +# ── Log all Spring Boot environment variables for debugging ────────────────── +echo "========================================" +echo "Spring Boot Configuration:" +echo "========================================" +echo "SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL}" +echo "SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}" +echo "SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}" +echo "JAVA_OPTS=${JAVA_OPTS:-not set}" +echo "OPENAI_API_KEY=${OPENAI_API_KEY:-not set}" +echo "========================================" + # ── Start all services via supervisord ─────────────────────────────────────── +# Export unbuffered output for both Python and Java +export PYTHONUNBUFFERED=1 +export JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8 -Djava.awt.headless=true" exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf diff --git a/docker/supervisord.conf b/docker/supervisord.conf index ed41d22..7cb0399 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -1,8 +1,10 @@ [supervisord] nodaemon=true +silent=false logfile=/dev/stdout logfile_maxbytes=0 pidfile=/var/run/supervisord.pid +loglevel=info [program:postgres] command=/usr/lib/postgresql/16/bin/postgres -D /var/lib/postgresql/data @@ -15,7 +17,7 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:backend] -command=java -jar /app/app.jar + command=java -Dspring.output.ansi.enabled=always -Dlogging.level.root=DEBUG -jar /app/app.jar autostart=true autorestart=true startsecs=15