From 873818c3382971f22143aa5a85a9739f2b4d05c9 Mon Sep 17 00:00:00 2001
From: Quildra <Quildra@gmail.com>
Date: Mon, 22 May 2023 12:20:42 +0100
Subject: [PATCH] revert to basic

---
 immich-docker-compose.yml | 58 +++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/immich-docker-compose.yml b/immich-docker-compose.yml
index 3458949..c3ff9d2 100644
--- a/immich-docker-compose.yml
+++ b/immich-docker-compose.yml
@@ -6,13 +6,13 @@ services:
     image: ghcr.io/immich-app/immich-server:release
     entrypoint: ["/bin/sh", "./start-server.sh"]
     volumes:
-      - /mnt/pokecenter/Media/Immich:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+    env_file:
+      - .env
     depends_on:
       - redis
       - database
       - typesense
-    ports:
-      - 3001:3001
     restart: always
 
   immich-microservices:
@@ -20,41 +20,43 @@ services:
     image: ghcr.io/immich-app/immich-server:release
     entrypoint: ["/bin/sh", "./start-microservices.sh"]
     volumes:
-      - /mnt/pokecenter/Media/Immich:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+    env_file:
+      - .env
     depends_on:
       - redis
       - database
       - typesense
-    ports:
-      - 3002:3002
     restart: always
 
   immich-machine-learning:
     container_name: immich_machine_learning
     image: ghcr.io/immich-app/immich-machine-learning:release
     volumes:
-      - /mnt/pokecenter/Media/Immich:/usr/src/app/upload
-      - /usr/docker_binds/immich/model-cache:/cache
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - model-cache:/cache
+    env_file:
+      - .env
     restart: always
-    ports:
-      - 3003:3003
 
   immich-web:
     container_name: immich_web
     image: ghcr.io/immich-app/immich-web:release
     entrypoint: ["/bin/sh", "./entrypoint.sh"]
-    ports:
-      - 3000:3000
+    env_file:
+      - .env
     restart: always
 
   typesense:
     container_name: immich_typesense
     image: typesense/typesense:0.24.0
     environment:
-      - TYPESENSE_API_KEY=Hw284ujpXNwLnVnt
+      - TYPESENSE_API_KEY=${TYPESENSE_API_KEY}
       - TYPESENSE_DATA_DIR=/data
+    logging:
+      driver: none
     volumes:
-      - /usr/docker_binds/immich/tsdata:/data
+      - tsdata:/data
     restart: always
 
   redis:
@@ -65,25 +67,33 @@ services:
   database:
     container_name: immich_postgres
     image: postgres:14
+    env_file:
+      - .env
     environment:
-      - POSTGRES_PASSWORD=47v83xHwqwg0XeMj
-      - POSTGRES_USER=Immich
-      - POSTGRES_DB=Immich
-      - PG_DATA=/var/lib/postgresql/data
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_DB: ${DB_DATABASE_NAME}
+      PG_DATA: /var/lib/postgresql/data
     volumes:
-      - /usr/docker_binds/immich/pgdata:/var/lib/postgresql/data
+      - pgdata:/var/lib/postgresql/data
     restart: always
 
   immich-proxy:
     container_name: immich_proxy
     image: ghcr.io/immich-app/immich-proxy:release
-    #environment:
+    environment:
       # Make sure these values get passed through from the env file
-      #- IMMICH_WEB_URL #=http://immich-web:3000
-      #- IMMICH_SERVER_URL #=http://immich-server:3001
-      #- IMMICH_MACHINE_LEARNING_URL #=http://immich-machine-learning:3003
+      - IMMICH_SERVER_URL
+      - IMMICH_WEB_URL
     ports:
       - 2283:8080
+    logging:
+      driver: none
     depends_on:
       - immich-server
-    restart: always
\ No newline at end of file
+    restart: always
+
+volumes:
+  pgdata:
+  model-cache:
+  tsdata: