merging up to master from dev

immich/.env

@@ -9,7 +9,11 @@ DB_DATA_LOCATION=/mnt/storage/appdata/immich/postgres
 TZ=America/New_York
 
 # The Immich version to use. You can pin this to a specific version like "v1.71.0"
+<<<<<<< HEAD
 IMMICH_VERSION=v1.136.0
+=======
+IMMICH_VERSION=v2.2.3
+>>>>>>> dev
 
 # Connection secret for postgres. You should change it to a random password
 DB_PASSWORD=postgres

immich/compose.yaml

@@ -1,10 +1,11 @@
 #
-# WARNING: Make sure to use the docker-compose.yml of the current release:
+# WARNING: To install Immich, follow our guide: https://immich.app/docs/install/docker-compose
+#
+# Make sure to use the docker-compose.yml of the current release:
 #
 # https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
 #
 # The compose file on main may not be compatible with the latest release.
-#
 
 name: immich
 
@@ -16,50 +17,57 @@ services:
     #   file: hwaccel.transcoding.yml
     #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     volumes:
-      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
+      - ${UPLOAD_LOCATION}:/data
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
     ports:
-      - 2283:2283
+      - '2283:2283'
     depends_on:
       - redis
       - database
     restart: always
+    healthcheck:
+      disable: false
 
   immich-machine-learning:
     container_name: immich_machine_learning
-    # For hardware acceleration, add one of -[armnn, cuda, openvino] to the image tag.
+    # For hardware acceleration, add one of -[armnn, cuda, rocm, openvino, rknn] to the image tag.
     # Example tag: ${IMMICH_VERSION:-release}-cuda
     image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
     # extends: # uncomment this section for hardware acceleration - see https://immich.app/docs/features/ml-hardware-acceleration
     #   file: hwaccel.ml.yml
-    #   service: cpu # set to one of [armnn, cuda, openvino, openvino-wsl] for accelerated inference - use the `-wsl` version for WSL2 where applicable
+    #   service: cpu # set to one of [armnn, cuda, rocm, openvino, openvino-wsl, rknn] for accelerated inference - use the `-wsl` version for WSL2 where applicable
     volumes:
       - model-cache:/cache
     env_file:
       - .env
     restart: always
+    healthcheck:
+      disable: false
 
   redis:
     container_name: immich_redis
-    image: docker.io/redis:6.2-alpine@sha256:d6c2911ac51b289db208767581a5d154544f2b2fe4914ea5056443f62dc6e900
+    image: docker.io/valkey/valkey:8-bookworm@sha256:fea8b3e67b15729d4bb70589eb03367bab9ad1ee89c876f54327fc7c6e618571
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
 
   database:
     container_name: immich_postgres
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0-pgvectors0.2.0
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:8d292bdb796aa58bbbaa47fe971c8516f6f57d6a47e7172e62754feb6ed4e7b0
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: ${DB_DATABASE_NAME}
       POSTGRES_INITDB_ARGS: '--data-checksums'
       # Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
-      DB_STORAGE_TYPE: 'HDD'
+      # DB_STORAGE_TYPE: 'HDD'
     volumes:
+      # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
       - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
+    shm_size: 128mb
     restart: always
 
 volumes:

jellyfin/compose.yaml

@@ -2,13 +2,16 @@ services:
   jellyfin:
     image: jellyfin/jellyfin
     container_name: jellyfin
-    user: 1000:1000
     network_mode: 'host'
     volumes:
       - /mnt/storage/appdata/jellyfin/config:/config
       - /mnt/storage/appdata/jellyfin/config/web-config.json:/jellyfin/jellyfin-web/config.json
       - /mnt/storage/appdata/jellyfin/cache:/cache
       - /mnt/cygnus:/cygnus:ro
+      - type: bind
+        source: /mnt/storage/appdata/jellyfin/media
+        target: /media
+        read_only: true
     restart: 'unless-stopped'
     # Optional - alternative address used for autodiscovery
     # environment:

makemkv/compose.yaml

@@ -0,0 +1,11 @@
+services:
+  makemkv:
+    image: jlesage/makemkv
+    ports:
+      - "5801:5800"
+    volumes:
+      - "/home/cjones/makemkv:/config:rw"
+      - "/home/cjones/makemkv/storage:/storage:ro"
+      - "/home/cjones/makemkv/output:/output:rw"
+    devices:
+      - "/dev/sr0:/dev/sr0"

nextcloud/compose.yaml

@@ -16,7 +16,7 @@ services:
   app:
     depends_on:
       - db
-    image: nextcloud:30
+    image: nextcloud:32
     restart: always
     ports:
       - 8080:80