Rename Datatabase env vars and add main postgres container

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

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_PASSWORD: ${IMMICH_DB_PASSWORD}
-      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_USER: ${IMMICH_DB_USERNAME}
-      POSTGRES_DB: ${DB_DATABASE_NAME}
+      POSTGRES_DB: ${IMMICH_DB_DATABASE_NAME}
       POSTGRES_INITDB_ARGS: '--data-checksums'
       DB_STORAGE_TYPE: 'HDD'
     volumes:

paperless/.env.example

@@ -9,9 +9,9 @@ PAPERLESS_SECRET_KEY=
 
 PAPERLESS_URL=
 
-POSTGRES_DB=
+PAPERLESS_POSTGRES_DB=
-POSTGRES_USER=
+PAPERLESS_POSTGRES_USER=
-POSTGRES_PASSWORD=
+PAPERLESS_POSTGRES_PASSWORD=
 
 #optional
 PAPERLESS_TIME_ZONE=

paperless/docker-compose.yml

@@ -11,9 +11,9 @@ services:
     volumes:
       - ${PAPERLESS_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
-      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_DB: ${PAPERLESS_POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_USER: ${PAPERLESS_POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      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_DBNAME: ${PAPERLESS_POSTGRES_DB}
-      PAPERLESS_DBUSER: ${POSTGRES_USER}
+      PAPERLESS_DBUSER: ${PAPERLESS_POSTGRES_USER}
-      PAPERLESS_DBPASS: ${POSTGRES_PASSWORD}
+      PAPERLESS_DBPASS: ${PAPERLESS_POSTGRES_PASSWORD}
       PAPERLESS_TIKA_ENABLED: 1
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998

postgres/.env.example

@@ -0,0 +1,2 @@
+POSTGRES_USER=
+POSTGRES_PASSWORD=

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:

synapse/.env.example

@@ -1,9 +1,9 @@
 SYNAPSE_POSTGRES_DATA_DIR=
 SYNAPSE_CONFIG_DIR=
 
-POSTGRES_DB=
+SYNAPSE_POSTGRES_DB=
-POSTGRES_USER=
+SYNAPSE_POSTGRES_USER=
-POSTGRES_PASSWORD=
+SYNAPSE_POSTGRES_PASSWORD=
 
 MAS_CONFIG_DIR=
 

synapse/docker-compose.yml

@@ -83,9 +83,9 @@ services:
     volumes:
       - ${SYNAPSE_POSTGRES_DATA_DIR}:/var/lib/postgresql/data
     environment:
-      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_DB: ${SYNAPSE_POSTGRES_DB}
-      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_USER: ${SYNAPSE_POSTGRES_USER}
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      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