From bdff81c6b23bbe2eaa40d889fe2ec0b6915a1443 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Tue, 3 Sep 2024 16:58:25 -0400 Subject: [PATCH] =?UTF-8?q?feature(compose):=20directly=20inject=20.env=20?= =?UTF-8?q?file=20=C3=A0=20containers=20api=20et=20ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4def68e..5487eb1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,9 +3,9 @@ services: db: image: 'docker.io/library/postgres:16' environment: - POSTGRES_DATABASE: "${BOTTIN_SERVER_API_DB_DATABASE:-bottin}" - POSTGRES_PASSWORD: "${BOTTIN_SERVER_API_DB_PASSWORD:-bottin}" - POSTGRES_USER: "${BOTTIN_SERVER_API_DB_USER:-bottin}" + POSTGRES_DATABASE: "${BOTTIN_SERVER_API_DB_DATABASE:?}" + POSTGRES_PASSWORD: "${BOTTIN_SERVER_API_DB_PASSWORD:?}" + POSTGRES_USER: "${BOTTIN_SERVER_API_DB_USER:?}" volumes: - 'db-data:/var/lib/postgresql/data' restart: 'unless-stopped' @@ -15,13 +15,7 @@ services: - db build: . image: 'git.agecem.com/agecem/bottin:latest' - env: - BOTTIN_SERVER_API_DB_DATABASE: "${BOTTIN_SERVER_API_DB_DATABASE:-bottin}" - BOTTIN_SERVER_API_DB_HOST: "${BOTTIN_SERVER_API_DB_HOST:-db}" - BOTTIN_SERVER_API_DB_PASSWORD: "${BOTTIN_SERVER_API_DB_PASSWORD:-bottin}" - BOTTIN_SERVER_API_DB_USER: "${BOTTIN_SERVER_API_DB_USER:-bottin}" - #BOTTIN_SERVER_API_HOST: "${BOTTIN_SERVER_API_HOST:}" - #BOTTIN_SERVER_API_KEY: "${BOTTIN_SERVER_API_KEY + env_file: '.env' ports: - '1312:1312' volumes: @@ -34,9 +28,7 @@ services: - api build: . image: 'git.agecem.com/agecem/bottin:latest' - env: - BOTTIN_WEB_PASSWORD: "${BOTTIN_WEB_PASSWORD:-bottin}" - BOTTIN_WEB_USER: "${BOTTIN_WEB_USER:-bottin}" + env_file: '.env' ports: - '2312:2312' volumes: