diff options
| author | Freya Murphy <freya@freyacat.org> | 2024-12-23 22:14:44 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2024-12-23 22:14:44 -0500 |
| commit | 45b58da72187a7b1ed4d75fc25bf5dd59a86a9c4 (patch) | |
| tree | 721d43e663d0b9d7c15ebc4b180ba709e9e0f9c3 /docker/docker-compose.db.yml | |
| parent | lang null check (diff) | |
| download | crimson-45b58da72187a7b1ed4d75fc25bf5dd59a86a9c4.tar.gz crimson-45b58da72187a7b1ed4d75fc25bf5dd59a86a9c4.tar.bz2 crimson-45b58da72187a7b1ed4d75fc25bf5dd59a86a9c4.zip | |
rework tooling to make environement loading easier
Diffstat (limited to 'docker/docker-compose.db.yml')
| -rw-r--r-- | docker/docker-compose.db.yml | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/docker/docker-compose.db.yml b/docker/docker-compose.db.yml index 4979bbe..b5cf34d 100644 --- a/docker/docker-compose.db.yml +++ b/docker/docker-compose.db.yml @@ -25,16 +25,14 @@ services: # This service stack is only enabled when API_ENABLED=true. postgres: - build: ../build/postgres + build: ${CRIMSON_ROOT}/build/postgres restart: unless-stopped + env_file: DOCKER_ENV_FILES environment: - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C - - POSTGRES_DB - - POSTGRES_USER - - POSTGRES_PASSWORD volumes: - - ${DATA}/schemas:/var/lib/postgresql/data - - ${SOURCE}/db:/db:ro + - ${PROJECT_DATA}/schemas:/var/lib/postgresql/data + - ${PROJECT_SOURCE}/db:/db:ro healthcheck: test: pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB} interval: 1s @@ -55,17 +53,12 @@ services: # # For information on databse conventions and layouts, see # `build/db-init/README.md`. - build: ../build/db-init + build: ${CRIMSON_ROOT}/build/db-init restart: no - environment: - - POSTGRES_DB - - POSTGRES_USER - - POSTGRES_PASSWORD - - API_ENABLED - - API_SECRET + env_file: DOCKER_ENV_FILES volumes: - - ${SOURCE}/db:/db:ro - - ${DATA}/crimson:/var/run/crimson + - ${PROJECT_SOURCE}/db:/db:ro + - ${PROJECT_DATA}/crimson:/var/run/crimson depends_on: postgres: condition: service_healthy |