diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 30517b5..cfbc73e 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,7 +1,7 @@ services: - condado-newsletter-postgress: + condado-newsletter-postgres: image: postgres:16 - container_name: condado-newsletter-postgress + container_name: condado-newsletter-postgres restart: unless-stopped environment: POSTGRES_DB: ${APP_DB_NAME:-condado} @@ -21,12 +21,12 @@ services: container_name: condado-newsletter restart: unless-stopped depends_on: - condado-newsletter-postgress: + condado-newsletter-postgres: condition: service_healthy environment: SPRING_PROFILES_ACTIVE: prod SPRING_JPA_HIBERNATE_DDL_AUTO: ${SPRING_JPA_HIBERNATE_DDL_AUTO:-update} - SPRING_DATASOURCE_URL: jdbc:postgresql://condado-newsletter-postgress:5432/${APP_DB_NAME:-condado} + SPRING_DATASOURCE_URL: jdbc:postgresql://condado-newsletter-postgres:5432/${APP_DB_NAME:-condado} SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} APP_PASSWORD: ${APP_PASSWORD} diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 3dd6582..bef25da 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -9,7 +9,7 @@ APP_DB_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-condado} mkdir -p /var/log/supervisor # ── Defaults for external PostgreSQL service in production compose ─────────── -export SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://condado-newsletter-postgress:5432/${APP_DB_NAME}} +export SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://condado-newsletter-postgres:5432/${APP_DB_NAME}} export SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-${APP_DB_USER}} export SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-${APP_DB_PASSWORD}} export JWT_EXPIRATION_MS=${JWT_EXPIRATION_MS:-86400000}