From f59de9df632b1a5fcbcb0087126decb3564f74e2 Mon Sep 17 00:00:00 2001
From: Trevor Vallender <t@tsvallender.co.uk>
Date: Mon, 5 Aug 2024 11:29:33 +0000
Subject: [PATCH] Immich updates

---
 .immich-env => immich/.env         |  7 +++++--
 immich.yaml => immich/compose.yaml | 13 ++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)
 rename .immich-env => immich/.env (65%)
 rename immich.yaml => immich/compose.yaml (91%)

diff --git a/.immich-env b/immich/.env
similarity index 65%
rename from .immich-env
rename to immich/.env
index d32f5e6..2d7bc31 100644
--- a/.immich-env
+++ b/immich/.env
@@ -1,10 +1,13 @@
-UPLOAD_LOCATION=/storage/immich/uploads
+# 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=/storage/immich
 
 # The Immich version to use. You can pin this to a specific version like "v1.71.0"
 IMMICH_VERSION=release
 
 # Connection secret for postgres. You should change it to a random password
-DB_PASSWORD=Yp5WHorTGDD6Ce
+DB_PASSWORD=postgres
 
 # The values below this line do not need to be changed
 ###################################################################################
diff --git a/immich.yaml b/immich/compose.yaml
similarity index 91%
rename from immich.yaml
rename to immich/compose.yaml
index 6a8af02..740dbdb 100644
--- a/immich.yaml
+++ b/immich/compose.yaml
@@ -11,7 +11,7 @@ services:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     env_file:
-      - .immich-env
+      - .env
     ports:
       - 2283:3001
     depends_on:
@@ -22,12 +22,15 @@ services:
   immich-microservices:
     container_name: immich_microservices
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
+    # extends:
+    #   file: hwaccel.yml
+    #   service: hwaccel
     command: [ "start.sh", "microservices" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     env_file:
-      - .immich-env
+      - .env
     depends_on:
       - redis
       - database
@@ -39,7 +42,7 @@ services:
     volumes:
       - model-cache:/cache
     env_file:
-      - .immich-env
+      - .env
     restart: always
 
   redis:
@@ -51,10 +54,10 @@ services:
     container_name: immich_postgres
     image: tensorchord/pgvecto-rs:pg14-v0.1.11@sha256:0335a1a22f8c5dd1b697f14f079934f5152eaaa216c09b61e293be285491f8ee
     env_file:
-      - .immich-env
+      - .env
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_USER: postgres
       POSTGRES_DB: ${DB_DATABASE_NAME}
     volumes:
       - pgdata:/var/lib/postgresql/data