From f30851fd6b38d96b7a7f869fe72fe0026f7d2a9d Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Mon, 6 Jan 2025 19:06:59 -0800
Subject: [PATCH] immich tweaks

---
 immich/README.md          |  6 +++---
 immich/docker-compose.yml | 25 ++++++++-----------------
 immich/sample.env         | 26 +++++++++++---------------
 3 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/immich/README.md b/immich/README.md
index c75ae38..4963e8a 100644
--- a/immich/README.md
+++ b/immich/README.md
@@ -1,6 +1,6 @@
 # Immich
 
-[Documentation](https://immich.app/docs/install/docker-compose/)
-
-Port: 2283
+* [Documentation](https://immich.app/docs/install/docker-compose/)
+* [Documentation for env variables](https://immich.app/docs/install/environment-variables)
 
+Reverse Poxy Port: 2283
diff --git a/immich/docker-compose.yml b/immich/docker-compose.yml
index d732048..15c2441 100644
--- a/immich/docker-compose.yml
+++ b/immich/docker-compose.yml
@@ -10,19 +10,16 @@ services:
       - ${VOL_PATH:-./data}/immich-import:/import
       - /etc/localtime:/etc/localtime:ro
     environment:
-      - REDIS_HOSTNAME=${REDIS_HOSTNAME:-immich-redis}
-      - DB_HOSTNAME=${DB_HOSTNAME:-immich-postgres}
-      - DB_PASSWORD=${DB_PASSWORD:-postgres}
-      - DB_USERNAME=${DB_USERNAME:-postgres}
-      - DB_DATABASE_NAME=${DB_DATABASE_NAME:-immich}
+      - REDIS_HOSTNAME=${IMMICH_REDIS_HOSTNAME:-immich-redis}
+      - DB_HOSTNAME=${IMMICH_DB_HOSTNAME:-immich-postgres}
+      - DB_PASSWORD=${IMMICH_DB_PASSWORD:-postgres}
+      - DB_USERNAME=${IMMICH_DB_USERNAME:-postgres}
+      - DB_DATABASE_NAME=${IMMICH_DB_DATABASE_NAME:-immich}
     depends_on:
       - immich-redis
       - immich-postgres
     healthcheck:
       disable: false
-    networks:
-      - immich-net
-      - proxy
 
   immich-machine-learning:
     # For hardware acceleration, add one of -[armnn, cuda, openvino] to the image tag.
@@ -35,22 +32,18 @@ services:
       - ${VOL_PATH:-./data}/model-cache:/cache
     healthcheck:
       disable: false
-    networks:
-      - immich-net
 
   immich-redis:
     image: docker.io/redis:6.2-alpine@sha256:eaba718fecd1196d88533de7ba49bf903ad33664a92debb24660a922ecd9cac8
     healthcheck:
       test: redis-cli ping || exit 1
-    networks:
-      - immich-net
 
   immich-postgres:
     image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
     environment:
-      POSTGRES_PASSWORD: ${DB_PASSWORD:-postgrespass}
-      POSTGRES_USER: ${DB_USERNAME:-postgres}
-      POSTGRES_DB: ${DB_DATABASE_NAME:-immich}
+      POSTGRES_PASSWORD: ${IMMICH_DB_PASSWORD:-postgrespass}
+      POSTGRES_USER: ${IMMICH_DB_USERNAME:-postgres}
+      POSTGRES_DB: ${IMMICH_DB_DATABASE_NAME:-immich}
       POSTGRES_INITDB_ARGS: '--data-checksums'
     volumes:
       - ${VOL_PATH:-./data}/immich-postgres:/var/lib/postgresql/data
@@ -71,5 +64,3 @@ services:
       -c max_wal_size=2GB
       -c shared_buffers=512MB
       -c wal_compression=on
-    networks:
-      - immich-net
diff --git a/immich/sample.env b/immich/sample.env
index 90e8d91..fdd8a0f 100644
--- a/immich/sample.env
+++ b/immich/sample.env
@@ -1,21 +1,17 @@
+# IMMICH
+# documentation for env variables: https://immich.app/docs/install/environment-variables
 
+## Global
 COOKBOOK=/git/docker-compose-cookbooks #HELP: cookbooks
 VOL_PATH=./data
 TZ=America/Vancouver
 
-# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables
-
-# The location where your uploaded files are stored
-UPLOAD_LOCATION=./library
-# The location where your database files are stored
-DB_DATA_LOCATION=./postgres
-
-# The Immich version to use. You can pin this to a specific version like "v1.71.0"
+## App
+IMMICH_UPLOAD_LOCATION=./library
+IMMICH_DB_DATA_LOCATION=./postgres
 IMMICH_VERSION=release
-
-DB_HOSTNAME=immich-postgres
-DB_PASSWORD=postgres
-DB_USERNAME=postgres
-DB_DATABASE_NAME=immich
-
-REDIS_HOSTNAME=immich-redis
\ No newline at end of file
+IMMICH_DB_HOSTNAME=immich-postgres
+IMMICH_DB_PASSWORD=postgres
+IMMICH_DB_USERNAME=postgres
+IMMICH_DB_DATABASE_NAME=immich
+IMMICH_REDIS_HOSTNAME=immich-redis