From 7343f6ca7d54665b9737efc7af2adeceefb276ef Mon Sep 17 00:00:00 2001 From: James Date: Tue, 27 Sep 2022 19:50:49 +0100 Subject: [PATCH] separate postgres db into separate override compose file --- .env.example | 1 + docker-compose.db.yaml | 24 ++++++++++++++++++++++++ docker-compose.yaml | 20 +------------------- 3 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 docker-compose.db.yaml diff --git a/.env.example b/.env.example index 7a8c44a..08c409b 100644 --- a/.env.example +++ b/.env.example @@ -11,3 +11,4 @@ NEXTCLOUD_MEM_LIMIT=4g # postgres POSTGRES_TAG=14 +POSTGRES_HOST=db \ No newline at end of file diff --git a/docker-compose.db.yaml b/docker-compose.db.yaml new file mode 100644 index 0000000..073b8e3 --- /dev/null +++ b/docker-compose.db.yaml @@ -0,0 +1,24 @@ +services: + db: + image: postgres:${POSTGRES_TAG} + restart: unless-stopped + volumes: + - ${VOLUME_PATH}/var/lib/postgresql/data:/var/lib/postgresql/data:rw + secrets: + - postgres_db + - postgres_user + - postgres_password + networks: + - backend + environment: + POSTGRES_DB_FILE: /run/secrets/postgres_db + POSTGRES_USER_FILE: /run/secrets/postgres_user + POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password + nextcloud: + environment: + POSTGRES_HOST: db + depends_on: + - db + cron: + depends_on: + - db diff --git a/docker-compose.yaml b/docker-compose.yaml index 7f7d17c..05ab00d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -17,22 +17,6 @@ networks: backend: services: - db: - image: postgres:${POSTGRES_TAG} - restart: unless-stopped - volumes: - - ${VOLUME_PATH}/var/lib/postgresql/data:/var/lib/postgresql/data:rw - secrets: - - postgres_db - - postgres_user - - postgres_password - networks: - - backend - environment: - POSTGRES_DB_FILE: /run/secrets/postgres_db - POSTGRES_USER_FILE: /run/secrets/postgres_user - POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password - redis: image: redis:alpine restart: unless-stopped @@ -62,14 +46,13 @@ services: POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password POSTGRES_DB_FILE: /run/secrets/postgres_db POSTGRES_USER_FILE: /run/secrets/postgres_user - POSTGRES_HOST: db + POSTGRES_HOST: ${POSTGRES_HOST} NEXTCLOUD_ADMIN_PASSWORD_FILE: /run/secrets/nextcloud_admin_password NEXTCLOUD_ADMIN_USER_FILE: /run/secrets/nextcloud_admin_user REDIS_HOST: redis NEXTCLOUD_TRUSTED_DOMAINS: ${NEXTCLOUD_DOMAIN} OVERWRITEPROTOCOL: https depends_on: - - db - redis cron: @@ -81,5 +64,4 @@ services: - backend entrypoint: /cron.sh depends_on: - - db - redis