Update to latest v2.2.3 & fix file & db locations in volumes

.drone.yml

@@ -17,7 +17,6 @@ steps:
       DOMAIN: {{ .Name }}.swarm-test.autonomic.zone
       STACK_NAME: {{ .Name }}
       LETS_ENCRYPT_ENV: production
-      SECRET_DB_PASSWORD_VERSION: v1
 trigger:
   branch:
     - main

.env.sample

@@ -7,28 +7,21 @@ DOMAIN=immich.example.com
 
 LETS_ENCRYPT_ENV=production
 
-ENABLE_BACKUPS=true
-
 # 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
+
 # To set a timezone, uncomment the next line and change Etc/UTC to a TZ identifier from this list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
 # TZ=Etc/UTC
 
+# Connection secret for postgres. You should change it to a random password
+# Please use only the characters `A-Za-z0-9`, without special characters or spaces
+DB_PASSWORD=postgres
+
+# The values below this line do not need to be changed
+###################################################################################
 DB_USERNAME=postgres
 DB_DATABASE_NAME=immich
-#DB_STORAGE_TYPE=HDD
-
-
-SECRET_DB_PASSWORD_VERSION=v1
-
-
-## Additional Storage:
-
-# COMPOSE_FILE="compose.yml"
-
-# external storage
-# COMPOSE_FILE="$COMPOSE_FILE:compose.storage.yml"
-# STORAGE_DEVICE="//uxxxxx-sub1.your-server.de/uxxxxx-sub1"
-# STORAGE_USERNAME="uuxxxxx-sub1"
-# STORAGE_PASSWORD="<your-password-not-to-be-checked-in-unencrypted-in-a-git-repository-"
-# STORAGE_READONLY=":ro"

README.md

@@ -5,13 +5,13 @@
 <!-- metadata -->
 
 * **Category**: Apps
-* **Status**: 1
+* **Status**: 0
 * **Image**: [`immich`](https://hub.docker.com/r/immich), 4, upstream
 * **Healthcheck**: No
 * **Backups**: No
-* **Email**: 1
+* **Email**: No
 * **Tests**: No
-* **SSO**: 1 (Oauth)
+* **SSO**: No
 
 <!-- endmetadata -->
 
@@ -23,9 +23,6 @@
 
 For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
 
-## How do I integrate with Keycloak SSO?
-
-See https://docs.immich.app/administration/oauth/. The `ISSUER_URL` in the Immich settings should be `https://<sso-domain>/realms/<realm_name>/.well-known/openid-configuration`.
 
 ## Volume
 
@@ -39,10 +36,3 @@ You can manually create a volume that has more storage for the library. For exam
 	--opt o=addr=uxxxxx.your-server.de,username=uxxxxxxx,password=*****,file_mode=0777,dir_mode=0777 \
 	--name immich_example_com_uploads
 ``` 
-
-## External Library
-
-If you want to use the [external library functionality](https://docs.immich.app/guides/external-library/) of immich via a cifs/smb-share-drive you can use the additional `compose.storage.yml` file.
-Just uncomment and edit the respective .env-files.
-
-The external storage will be mounted to `/mnt/external_storage` (this is your import path in immich).

abra.sh

@@ -1 +0,0 @@
-export PG_BACKUP_VERSION=v1

compose.storage.yml

@@ -1,15 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    volumes:
-      - external_storage:/mnt/external_storage${STORAGE_READONLY}
-
-volumes:
-  external_storage:
-    driver: local
-    driver_opts:
-      type: cifs
-      device: ${STORAGE_DEVICE}
-      o: "username=${STORAGE_USERNAME},password=${STORAGE_PASSWORD}"

compose.yml

@@ -3,93 +3,60 @@ version: "3.8"
 
 services:
   app:
-    image: ghcr.io/immich-app/immich-server:v3.0.1
+    image: ghcr.io/immich-app/immich-server:v2.2.3
     volumes:
-      - uploads:/usr/src/app/upload
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     environment:
+      - UPLOAD_LOCATION
+      - DB_DATA_LOCATION
       - TZ
       - IMMICH_VERSION
-      - DB_PASSWORD_FILE=/run/secrets/db_password
+      - DB_PASSWORD
       - DB_USERNAME
       - DB_DATABASE_NAME
-    secrets:
-      - db_password
     networks:
       - proxy
       - backend
     healthcheck:
-      test: ["CMD-SHELL", "immich-healthcheck"]
-      start_period: 120s
-    depends_on:
-      - redis
-      - database
+      disable: false
     deploy:
-      update_config:
-        failure_action: continue
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=2283"
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=1.9.0+v3.0.1"
-        - "backupbot.backup=${ENABLE_BACKUPS:-true}"
-        - "backupbot.volumes.model-cache=false"
-        - "backupbot.volumes.uploads=false"
-        - "backupbot.volumes.external_storage=false"
+        - "coop-cloud.${STACK_NAME}.version=1.0.0+v2.2.3"
 
 
   immich-machine-learning: # TODO: this has to be that name, as the frontend tries to reach it at: http://immich-machine-learning:3003
-    image: ghcr.io/immich-app/immich-machine-learning:v3.0.1
+    image: ghcr.io/immich-app/immich-machine-learning:v2.2.3
+    ports:
+      - 3003:3003
     volumes:
       - model-cache:/cache
     networks:
       - backend
     healthcheck:
       disable: false
-
   redis:
-    image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
+    image: redis:8.2-alpine
     healthcheck:
       test: redis-cli ping || exit 1
     networks:
       - backend
-
   database:
-    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.3.0@sha256:87c050465fb969a68c7ac23e375e21f4c95cfacd0edce5fa1bc31e63b7891891
+    image: tensorchord/pgvecto-rs:pg14-v0.2.0
     environment:
-      POSTGRES_PASSWORD_FILE: /run/secrets/db_password
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: ${DB_DATABASE_NAME}
       POSTGRES_INITDB_ARGS: '--data-checksums'
-      DB_STORAGE_TYPE: ${DB_STORAGE_TYPE:-SSD}
-    secrets:
-      - db_password
     volumes:
-      - postgres:/var/lib/postgresql/data
+      - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
     networks:
       - backend
-    deploy:
-      labels:
-        backupbot.backup: "${ENABLE_BACKUPS:-true}"
-        backupbot.backup.pre-hook: "/pg_backup.sh backup"
-        backupbot.backup.volumes.postgres.path: "backup.sql"
-        backupbot.restore.post-hook: "/pg_backup.sh restore"
-    configs:
-      - source: pg_backup
-        target: /pg_backup.sh
-        mode: 0555
-
-configs:
-  pg_backup:
-    name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
-    file: pg_backup.sh
-
-secrets:
-  db_password:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
 
 networks:
   proxy:
@@ -97,6 +64,4 @@ networks:
   backend:
 
 volumes:
-  uploads:
-  postgres:
   model-cache:

pg_backup.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Postgres backup/restore hook for immich's VectorChord/pgvecto.rs `database` service.
-# Two image-specific constraints:
-#   1. Never DROP DATABASE — the bundled pgvecto.rs worker PANICs and crashes the server.
-#      So `pg_dump --clean --if-exists` does a per-object replace in the live DB on restore.
-#   2. Restore rewrites the dump's empty search_path back to `public, pg_catalog` so VectorChord
-#      types resolve (per https://docs.immich.app/administration/backup-and-restore).
-
-set -e
-
-BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
-export PGPASSWORD=$(cat "${POSTGRES_PASSWORD_FILE:-/run/secrets/db_password}")
-DB_USER="${POSTGRES_USER:-postgres}"
-DB_NAME="${POSTGRES_DB:-immich}"
-
-function backup {
-  pg_dump --clean --if-exists -U "$DB_USER" "$DB_NAME" | gzip > "$BACKUP_FILE"
-}
-
-function restore {
-  gunzip -c "$BACKUP_FILE" \
-    | sed "s/SELECT pg_catalog.set_config('search_path', '', false);/SELECT pg_catalog.set_config('search_path', 'public, pg_catalog', true);/g" \
-    | psql -U "$DB_USER" -d "$DB_NAME" -f -
-}
-
-$@

release/1.2.0+v2.4.1

@@ -1 +0,0 @@
-Adds db_password secret, you'll need to create a new db secret when upgrading (e.g. `echo "secret" | abra app secret insert immich.example.com db_password v1`)

release/1.3.0+v2.4.1

@@ -1 +0,0 @@
-added support for external storage. skipped 1.2.0 because it was not released as tag

release/1.4.0+v2.5.6

@@ -1 +0,0 @@
-changed database-images to the recommended one's by immich. this should work seemlessly. In doubt check PR #3: https://git.coopcloud.tech/coop-cloud/immich/pulls/3#issuecomment-30213.

release/1.5.0+v2.6.3

@@ -1 +0,0 @@
-there might be some long running db migrations that cause the update to look like it's timed out, check `abra ps` to verify status

release/1.5.1+v2.6.3

@@ -1 +0,0 @@
-patch to fix my tagging screw up

release/1.9.0+v3.0.1

@@ -1 +0,0 @@
-upgrade to immich 3 successfully deployed, but perhaps better check https://immich.app/blog/v3-migration if it affects your deployment

renovate.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ]
-}