From 206d6cc6053e38701630886c720d301c898bbcda Mon Sep 17 00:00:00 2001 From: Peter Smit Date: Sun, 14 Sep 2025 09:41:34 +0200 Subject: [PATCH] Rename Datatabase env vars and add main postgres container --- docker-compose.yml | 1 + immich/docker-compose.yml | 22 ++++++++++------------ paperless/.env.example | 6 +++--- paperless/docker-compose.yml | 12 ++++++------ postgres/.env.example | 2 ++ postgres/docker-compose.yml | 18 ++++++++++++++++++ synapse/.env.example | 6 +++--- synapse/docker-compose.yml | 8 +++++--- 8 files changed, 48 insertions(+), 27 deletions(-) create mode 100644 postgres/.env.example create mode 100644 postgres/docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml index 07b67f3..5a6f0b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ include: - pihole/docker-compose.yml - pingvin/docker-compose.yml - pocketid/docker-compose.yml + - postgres/docker-compose.yml - searxng/docker-compose.yml - spliit/docker-compose.yml - shlink/docker-compose.yml diff --git a/immich/docker-compose.yml b/immich/docker-compose.yml index 6a4226b..8e566aa 100644 --- a/immich/docker-compose.yml +++ b/immich/docker-compose.yml @@ -11,30 +11,28 @@ services: - /etc/localtime:/etc/localtime:ro env_file: - .env + environment: + DB_HOSTNAME: ${IMMICH_DB_HOSTNAME} + DB_USERNAME: ${IMMICH_DB_USERNAME} + DB_PASSWORD: ${IMMICH_DB_PASSWORD} + DB_DATABASE_NAME: ${IMMICH_DB_DATABASE_NAME} ports: - '2283:2283' depends_on: - redis - database + networks: + - postgres restart: always - healthcheck: - disable: false immich-machine-learning: container_name: immich_machine_learning - # For hardware acceleration, add one of -[armnn, cuda, openvino] to the image tag. - # Example tag: ${IMMICH_VERSION:-release}-cuda image: ghcr.io/immich-app/immich-machine-learning:v1.142.0 - # extends: # uncomment this section for hardware acceleration - see https://immich.app/docs/features/ml-hardware-acceleration - # file: hwaccel.ml.yml - # service: cpu # set to one of [armnn, cuda, openvino, openvino-wsl] for accelerated inference - use the `-wsl` version for WSL2 where applicable volumes: - model-cache:/cache env_file: - .env restart: always - healthcheck: - disable: false redis: container_name: immich_redis @@ -47,9 +45,9 @@ services: container_name: immich_postgres image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0 environment: - POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_USER: ${DB_USERNAME} - POSTGRES_DB: ${DB_DATABASE_NAME} + POSTGRES_PASSWORD: ${IMMICH_DB_PASSWORD} + POSTGRES_USER: ${IMMICH_DB_USERNAME} + POSTGRES_DB: ${IMMICH_DB_DATABASE_NAME} POSTGRES_INITDB_ARGS: '--data-checksums' DB_STORAGE_TYPE: 'HDD' volumes: diff --git a/paperless/.env.example b/paperless/.env.example index 27a099f..9200886 100644 --- a/paperless/.env.example +++ b/paperless/.env.example @@ -9,9 +9,9 @@ PAPERLESS_SECRET_KEY= PAPERLESS_URL= -POSTGRES_DB= -POSTGRES_USER= -POSTGRES_PASSWORD= +PAPERLESS_POSTGRES_DB= +PAPERLESS_POSTGRES_USER= +PAPERLESS_POSTGRES_PASSWORD= #optional PAPERLESS_TIME_ZONE= diff --git a/paperless/docker-compose.yml b/paperless/docker-compose.yml index 073cbe4..7725477 100644 --- a/paperless/docker-compose.yml +++ b/paperless/docker-compose.yml @@ -11,9 +11,9 @@ services: volumes: - ${PAPERLESS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data environment: - POSTGRES_DB: ${POSTGRES_DB} - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${PAPERLESS_POSTGRES_DB} + POSTGRES_USER: ${PAPERLESS_POSTGRES_USER} + POSTGRES_PASSWORD: ${PAPERLESS_POSTGRES_PASSWORD} paperless: image: ghcr.io/paperless-ngx/paperless-ngx:2.18.4 @@ -34,9 +34,9 @@ services: environment: PAPERLESS_REDIS: redis://broker:6379 PAPERLESS_DBHOST: db - PAPERLESS_DBNAME: ${POSTGRES_DB} - PAPERLESS_DBUSER: ${POSTGRES_USER} - PAPERLESS_DBPASS: ${POSTGRES_PASSWORD} + PAPERLESS_DBNAME: ${PAPERLESS_POSTGRES_DB} + PAPERLESS_DBUSER: ${PAPERLESS_POSTGRES_USER} + PAPERLESS_DBPASS: ${PAPERLESS_POSTGRES_PASSWORD} PAPERLESS_TIKA_ENABLED: 1 PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 PAPERLESS_TIKA_ENDPOINT: http://tika:9998 diff --git a/postgres/.env.example b/postgres/.env.example new file mode 100644 index 0000000..95ccfc5 --- /dev/null +++ b/postgres/.env.example @@ -0,0 +1,2 @@ +POSTGRES_USER= +POSTGRES_PASSWORD= \ No newline at end of file diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml new file mode 100644 index 0000000..8eb3222 --- /dev/null +++ b/postgres/docker-compose.yml @@ -0,0 +1,18 @@ +services: + postgres: + image: ghcr.io/immich-app/postgres:17-vectorchord0.4.3-pgvectors0.3.0 + container_name: database + environment: + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_INITDB_ARGS: '--data-checksums --encoding=UTF-8 --locale=C' + DB_STORAGE_TYPE: 'HDD' + restart: always + env_file: + - .env + ports: + - 5432:5432 + networks: + - postgres +networks: + postgres: \ No newline at end of file diff --git a/synapse/.env.example b/synapse/.env.example index db36235..5261bf5 100644 --- a/synapse/.env.example +++ b/synapse/.env.example @@ -1,9 +1,9 @@ SYNAPSE_POSTGRES_DATA_DIR= SYNAPSE_CONFIG_DIR= -POSTGRES_DB= -POSTGRES_USER= -POSTGRES_PASSWORD= +SYNAPSE_POSTGRES_DB= +SYNAPSE_POSTGRES_USER= +SYNAPSE_POSTGRES_PASSWORD= MAS_CONFIG_DIR= diff --git a/synapse/docker-compose.yml b/synapse/docker-compose.yml index 461b2aa..b8f1b87 100644 --- a/synapse/docker-compose.yml +++ b/synapse/docker-compose.yml @@ -83,9 +83,9 @@ services: volumes: - ${SYNAPSE_POSTGRES_DATA_DIR}:/var/lib/postgresql/data environment: - POSTGRES_DB: ${POSTGRES_DB} - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${SYNAPSE_POSTGRES_DB} + POSTGRES_USER: ${SYNAPSE_POSTGRES_USER} + POSTGRES_PASSWORD: ${SYNAPSE_POSTGRES_PASSWORD} POSTGRES_INITDB_ARGS: '--encoding=UTF-8 --locale=C' synapse: container_name: synapse @@ -99,3 +99,5 @@ services: - synapse_db - mas - mautrix-whatsapp + networks: + - postgres