updated files

Docker-Compose/Immich/.env

@@ -1,29 +1,18 @@
-# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables
+# ============================================================
+# SYSTEM SETTINGS
+# ============================================================
+TZ=America/New_York
+IMMICH_VERSION=v3
 
-# The location where your uploaded files are stored
-UPLOAD_LOCATION=/home/ubuntu/docker/immich/upload
-
-# The location where your database files are stored
+# ============================================================
+# PATH LOCATIONS
+# ============================================================
+UPLOAD_LOCATION=/home/miker/docker/immich/library
 DB_DATA_LOCATION=/home/miker/docker/immich/postgres
 
-# To set a timezone, uncomment the next line and change Etc/UTC to a TZ identifier from this list: https://en.wikipedia.org/wiki/Lis>
-TZ=America/New_York
-
-# The Immich version to use. You can pin this to a specific version like "v1.71.0"
-IMMICH_VERSION=release
-
-
-# Connection secrets for postgres and typesense. You should change these to random passwords
-TYPESENSE_API_KEY=hOEZ7Tei3iIp
-DB_PASSWORD=ee438M3pcXo6
-
-# The values below this line do not need to be changed
-###################################################################################
-DB_HOSTNAME=immich_postgres
-DB_USERNAME=postgres
+# ============================================================
+# DATABASE CREDENTIALS
+# ============================================================
+DB_USERNAME=postgresadmin
+DB_PASSWORD=mM3PXXUjK0QMz7
 DB_DATABASE_NAME=immich
-
-REDIS_HOSTNAME=immich_redis
-
-IMMICH_SERVER_URL=https://immich.mikemcfetridge.com
-IMMICH_WEB_URL=https://immich.mikemcfetridge.com

Docker-Compose/Immich/docker-compose.yaml

@@ -1,60 +1,86 @@
+# Immich — Self-Hosted Photo & Video Management
+name: immich
+
 services:
   immich-server:
     container_name: immich_server
-    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
+    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-v3}
+    # extends:
+    #   file: hwaccel.transcoding.yml
+    #   service: cpu
+    environment:
+      - DB_USERNAME=${DB_USERNAME}
+      - DB_PASSWORD=${DB_PASSWORD}
+      - DB_DATABASE_NAME=${DB_DATABASE_NAME}
+      - TZ=${TZ}
     volumes:
-      - /home/miker/dockerapps/immich/upload:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/data
       - /etc/localtime:/etc/localtime:ro
-      - /home/miker/docker/immich/upload/import:/import
-    env_file:
-      - .env
     ports:
-      - 2283:3001
+      - "2283:2283"
     depends_on:
-      - redis
-      - database
-    restart: always
-
-  immich-microservices:
-    container_name: immich_microservices
-    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION}
-    extends:
-      file: hwaccel.yml
-      service: hwaccel
-    command: [ "start.sh", "microservices" ]
-    volumes:
-      - /home/miker/dockerapps/immich/upload:/usr/src/app/upload
-    env_file:
-      - .env
-    depends_on:
-      - redis
-      - database
-    restart: always
+      database:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    restart: unless-stopped
+    networks:
+      - immich
+      - main
 
   immich-machine-learning:
     container_name: immich_machine_learning
-    image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
+    image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-v3}
+    # extends:
+    #   file: hwaccel.ml.yml
+    #   service: cpu
+    environment:
+      - TZ=${TZ}
     volumes:
-      - /home/miker/dockerapps/immich/model-cache:/cache
-    env_file:
-      - .env
-    restart: always
+      - model-cache:/cache
+    restart: unless-stopped
+    networks:
+      - immich
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
-    restart: always
+    image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "valkey-cli ping || exit 1"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    networks:
+      - immich
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0@sha256:fa4f6e0971f454cd95fec5a9aaed2ed93d8f46725cc6bc61e0698e97dba96da1
-    env_file:
-      - .env
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0
     environment:
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_USER: ${DB_USERNAME}
-      POSTGRES_DB: ${DB_DATABASE_NAME}
-      POSTGRES_INITDB_ARGS: '--data-checksums'
+      - POSTGRES_USER=${DB_USERNAME}
+      - POSTGRES_PASSWORD=${DB_PASSWORD}
+      - POSTGRES_DB=${DB_DATABASE_NAME}
+      - POSTGRES_INITDB_ARGS=--data-checksums
+      - TZ=${TZ}
     volumes:
-      - /home/miker/dockerapps/immich/pgdata:/var/lib/postgresql/data
-    restart: always
+      - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
+    shm_size: 512mb
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME} -d ${DB_DATABASE_NAME}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 15s
+    networks:
+      - immich
+
+volumes:
+  model-cache:
+
+networks:
+  main:
+    external: true
+  immich:
+    driver: bridge