From 89d43b5c04f41f73c4d9cb852fad013925933bdb Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Wed, 16 Oct 2024 17:40:03 +1100
Subject: [PATCH] Add Redis storage and improve user setup

---
 authentication/compose.yaml     |  5 +++--
 document-collector/compose.yaml | 11 ++++++-----
 photo-collector/compose.yaml    | 23 +++++++++++++++--------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/authentication/compose.yaml b/authentication/compose.yaml
index c8bf7d3..569b157 100644
--- a/authentication/compose.yaml
+++ b/authentication/compose.yaml
@@ -39,8 +39,9 @@ services:
       service: base-service
     container_name: authelia-redis
     image: redis
-    #user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
-
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
+    volumes:
+      - ./volumes/redis_data/:/data/
   lldap:
     extends:
       file: ../compose.base.yaml
diff --git a/document-collector/compose.yaml b/document-collector/compose.yaml
index 38f7ecf..8bb7501 100644
--- a/document-collector/compose.yaml
+++ b/document-collector/compose.yaml
@@ -8,7 +8,7 @@ services:
     container_name: paperless
     image: ghcr.io/paperless-ngx/paperless-ngx
     environment:
-      PAPERLESS_REDIS: redis://paperless-broker:6379
+      PAPERLESS_REDIS: redis://paperless-redis:6379
       USERMAP_UID: ${NASCOMPOSE_UID?}
       USERMAP_GID: ${NASCOMPOSE_GID?}
       PAPERLESS_URL: https://paperless.${NASCOMPOSE_DOMAIN?}
@@ -18,7 +18,7 @@ services:
     networks:
       - default
     depends_on:
-      - paperless-broker
+      - paperless-redis
     volumes:
       - ./volumes/paperless_data/:/usr/src/paperless/data/
       - ${NASCOMPOSE_DATA?}/media/:/usr/src/paperless/media/
@@ -26,14 +26,15 @@ services:
       - ${NASCOMPOSE_DATA?}/export:/usr/src/paperless/export
     labels:
       traefik.http.routers.paperless.middlewares: authelia@file
-  paperless-broker:
+  paperless-redis:
     extends:
       file: ../compose.base.yaml
       service: base-service
-    container_name: paperless-broker
+    container_name: paperless-redis
     image: redis
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     volumes:
-      - ./volumes/broker_data/:/data/
+      - ./volumes/redis_data/:/data/
 networks:
   reverse-proxy:
     external: true
diff --git a/photo-collector/compose.yaml b/photo-collector/compose.yaml
index f7d2074..b19545c 100644
--- a/photo-collector/compose.yaml
+++ b/photo-collector/compose.yaml
@@ -12,35 +12,42 @@ services:
       - smtp-server
       - default
     depends_on:
-      - immich_redis
-      - immich_postgres
+      - immich-redis
+      - immich-postgres
     environment:
+      REDIS_HOSTNAME: immich-redis
+      DB_HOSTNAME: immich-postgres
       DB_USERNAME: postgres
       DB_PASSWORD: postgres
       DB_DATABASE_NAME: immich
     volumes:
       - ${NASCOMPOSE_DATA?}/media/photos/:/usr/src/app/upload/
-  immich-machine-learning:
+  immich-ml:
     extends:
       file: ../compose.base.yaml
       service: base-service
-    hostname: immich-machine-learning
+    container_name: immich-ml
     image: ghcr.io/immich-app/immich-machine-learning:release
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     volumes:
       - ./volumes/immich_ml_cache/:/cache/
-  immich_redis:
+      - ./volumes/immich_ml_config/:/.config/
+  immich-redis:
     extends:
       file: ../compose.base.yaml
       service: base-service
-    hostname: redis
+    container_name: immich-redis
     image: redis:6.2-alpine
     healthcheck:
       test: redis-cli ping || exit 1
-  immich_postgres:
+    user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
+    volumes:
+      - ./volumes/redis_data/:/data/
+  immich-postgres:
     extends:
       file: ../compose.base.yaml
       service: base-service
-    hostname: database
+    container_name: immich-postgres
     image: tensorchord/pgvecto-rs:pg14-v0.2.0
     user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?}
     environment: