fix: standardize PostgreSQL user and password environment variables in Docker Compose
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 11s
This commit is contained in:
@@ -3,10 +3,12 @@ services:
|
|||||||
image: postgres:16
|
image: postgres:16
|
||||||
container_name: condado-newsletter-postgres
|
container_name: condado-newsletter-postgres
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: ${APP_DB_NAME:-condado}
|
POSTGRES_DB: ${APP_DB_NAME:-condado}
|
||||||
POSTGRES_USER: ${POSTGRES_USER:-${SPRING_DATASOURCE_USERNAME:-condado}}
|
POSTGRES_USER: ${POSTGRES_USER:-condado}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-${SPRING_DATASOURCE_PASSWORD:-condado}}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-condado}
|
||||||
volumes:
|
volumes:
|
||||||
- postgres-data:/var/lib/postgresql/data
|
- postgres-data:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
@@ -22,6 +24,8 @@ services:
|
|||||||
image: sancho41/condado-newsletter:latest
|
image: sancho41/condado-newsletter:latest
|
||||||
container_name: condado-newsletter
|
container_name: condado-newsletter
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
depends_on:
|
depends_on:
|
||||||
condado-newsletter-postgres:
|
condado-newsletter-postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -32,9 +36,8 @@ services:
|
|||||||
SPRING_PROFILES_ACTIVE: prod
|
SPRING_PROFILES_ACTIVE: prod
|
||||||
SPRING_JPA_HIBERNATE_DDL_AUTO: ${SPRING_JPA_HIBERNATE_DDL_AUTO:-update}
|
SPRING_JPA_HIBERNATE_DDL_AUTO: ${SPRING_JPA_HIBERNATE_DDL_AUTO:-update}
|
||||||
SPRING_DATASOURCE_URL: jdbc:postgresql://condado-newsletter-postgres:5432/${APP_DB_NAME:-condado}
|
SPRING_DATASOURCE_URL: jdbc:postgresql://condado-newsletter-postgres:5432/${APP_DB_NAME:-condado}
|
||||||
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-${POSTGRES_USER:-condado}}
|
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-condado}
|
||||||
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-${POSTGRES_PASSWORD:-condado}}
|
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-condado}
|
||||||
APP_PASSWORD: ${APP_PASSWORD}
|
|
||||||
JWT_SECRET: ${JWT_SECRET}
|
JWT_SECRET: ${JWT_SECRET}
|
||||||
JWT_EXPIRATION_MS: ${JWT_EXPIRATION_MS:-86400000}
|
JWT_EXPIRATION_MS: ${JWT_EXPIRATION_MS:-86400000}
|
||||||
MAIL_HOST: ${MAIL_HOST}
|
MAIL_HOST: ${MAIL_HOST}
|
||||||
|
|||||||
Reference in New Issue
Block a user