fix: noms de flags pour infos DB et inject .env dans containers #43

Merged
vlbeaudoin merged 1 commit from vlbeaudoin/fix/compose-env into main 2024-09-16 15:03:15 -04:00 AGit
2 changed files with 8 additions and 6 deletions
Showing only changes of commit 70b0f4152a - Show all commits

View file

@ -10,9 +10,9 @@ Nécessite une installation fonctionnelle et accessible de [agecem/bottin](https
Remplir .env avec données d'environnement: Remplir .env avec données d'environnement:
``` ```
BOTTINAGENDA_POSTGRES_DATABASE=bottin-agenda BOTTINAGENDA_DB_DATABASE=bottin-agenda
BOTTINAGENDA_POSTGRES_PASSWORD=bottin-agenda BOTTINAGENDA_DB_PASSWORD=bottin-agenda
BOTTINAGENDA_POSTGRES_USER=bottin-agenda BOTTINAGENDA_DB_USER=bottin-agenda
``` ```
Déployer avec docker-compose: Déployer avec docker-compose:

View file

@ -3,9 +3,9 @@ services:
db: db:
image: 'docker.io/library/postgres:16.1' image: 'docker.io/library/postgres:16.1'
environment: environment:
POSTGRES_DATABASE: "${BOTTINAGENDA_POSTGRES_DATABASE}" POSTGRES_DATABASE: "${BOTTINAGENDA_DB_DATABASE:?}"
POSTGRES_PASSWORD: "${BOTTINAGENDA_POSTGRES_PASSWORD}" POSTGRES_PASSWORD: "${BOTTINAGENDA_DB_PASSWORD:?}"
POSTGRES_USER: "${BOTTINAGENDA_POSTGRES_USER}" POSTGRES_USER: "${BOTTINAGENDA_DB_USER:?}"
volumes: volumes:
- 'db-data:/var/lib/postgresql/data' - 'db-data:/var/lib/postgresql/data'
restart: 'unless-stopped' restart: 'unless-stopped'
@ -14,6 +14,7 @@ services:
depends_on: depends_on:
- db - db
build: . build: .
env_file: '.env'
image: 'git.agecem.com/agecem/bottin-agenda:latest' image: 'git.agecem.com/agecem/bottin-agenda:latest'
ports: ports:
- '1313:1313' - '1313:1313'
@ -26,6 +27,7 @@ services:
depends_on: depends_on:
- api - api
build: . build: .
env_file: '.env'
image: 'git.agecem.com/agecem/bottin-agenda:latest' image: 'git.agecem.com/agecem/bottin-agenda:latest'
ports: ports:
- '2313:2313' - '2313:2313'