agecem/bottin
5
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'feature(compose): directly inject .env file à containers api et ui' (#63) from vlbeaudoin/feature/inject-env-file into main

Browse source 
Reviewed-on: #63
This commit is contained in:
Victor Lacasse-Beaudoin 2024-09-03 16:58:53 -04:00
commit f874c449a7
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
docker-compose.yaml
View file

@ -3,9 +3,9 @@ services:
db: db:
image: 'docker.io/library/postgres:16' image: 'docker.io/library/postgres:16'
environment: environment:
POSTGRES_DATABASE: "${BOTTIN_SERVER_API_DB_DATABASE:-bottin}" POSTGRES_DATABASE: "${BOTTIN_SERVER_API_DB_DATABASE:?}"
POSTGRES_PASSWORD: "${BOTTIN_SERVER_API_DB_PASSWORD:-bottin}" POSTGRES_PASSWORD: "${BOTTIN_SERVER_API_DB_PASSWORD:?}"
POSTGRES_USER: "${BOTTIN_SERVER_API_DB_USER:-bottin}" POSTGRES_USER: "${BOTTIN_SERVER_API_DB_USER:?}"
volumes: volumes:
- 'db-data:/var/lib/postgresql/data' - 'db-data:/var/lib/postgresql/data'
restart: 'unless-stopped' restart: 'unless-stopped'
@ -15,13 +15,7 @@ services:
- db - db
build: . build: .
image: 'git.agecem.com/agecem/bottin:latest' image: 'git.agecem.com/agecem/bottin:latest'
env: env_file: '.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
ports: ports:
- '1312:1312' - '1312:1312'
volumes: volumes:
@ -34,9 +28,7 @@ services:
- api - api
build: . build: .
image: 'git.agecem.com/agecem/bottin:latest' image: 'git.agecem.com/agecem/bottin:latest'
env: env_file: '.env'
BOTTIN_WEB_PASSWORD: "${BOTTIN_WEB_PASSWORD:-bottin}"
BOTTIN_WEB_USER: "${BOTTIN_WEB_USER:-bottin}"
ports: ports:
- '2312:2312' - '2312:2312'
volumes: volumes: