Compare commits
1
Commits
main
..
6c6607dd49
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6c6607dd49 |
+5
-8
@@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: ghcr.io/immich-app/immich-server:v3.1.0
|
image: ghcr.io/immich-app/immich-server:v2.7.5
|
||||||
volumes:
|
volumes:
|
||||||
- uploads:/usr/src/app/upload
|
- uploads:/usr/src/app/upload
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
@@ -19,21 +19,18 @@ services:
|
|||||||
- proxy
|
- proxy
|
||||||
- backend
|
- backend
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "immich-healthcheck"]
|
disable: false
|
||||||
start_period: 120s
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
- redis
|
||||||
- database
|
- database
|
||||||
deploy:
|
deploy:
|
||||||
update_config:
|
|
||||||
failure_action: continue
|
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=2283"
|
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=2283"
|
||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=1.10.0+v3.1.0"
|
- "coop-cloud.${STACK_NAME}.version=1.7.0+v2.7.5"
|
||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
- "backupbot.volumes.model-cache=false"
|
- "backupbot.volumes.model-cache=false"
|
||||||
- "backupbot.volumes.uploads=false"
|
- "backupbot.volumes.uploads=false"
|
||||||
@@ -41,7 +38,7 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
immich-machine-learning: # TODO: this has to be that name, as the frontend tries to reach it at: http://immich-machine-learning:3003
|
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.1.0
|
image: ghcr.io/immich-app/immich-machine-learning:v2.7.5
|
||||||
volumes:
|
volumes:
|
||||||
- model-cache:/cache
|
- model-cache:/cache
|
||||||
networks:
|
networks:
|
||||||
@@ -50,7 +47,7 @@ services:
|
|||||||
disable: false
|
disable: false
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/valkey/valkey:9@sha256:3acc0687f2a2e1091fae6450d7842dd658c941338cf0a873ddd9e14b9e4ea4dd
|
image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: redis-cli ping || exit 1
|
test: redis-cli ping || exit 1
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
+29
-8
@@ -1,27 +1,48 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Postgres backup/restore hook for immich's VectorChord/pgvecto.rs `database` service.
|
# Postgres backup/restore hook for the immich `database` service (VectorChord/pgvecto.rs). Restore
|
||||||
# Two image-specific constraints:
|
# follows the same pattern as the (green) matrix-synapse recipe — a local-trust `pg_hba` lockout so
|
||||||
# 1. Never DROP DATABASE — the bundled pgvecto.rs worker PANICs and crashes the server.
|
# the app can't reconnect and race the reimport — plus the `search_path` rewrite from immich's docs
|
||||||
# So `pg_dump --clean --if-exists` does a per-object replace in the live DB on restore.
|
# (https://docs.immich.app/administration/backup-and-restore) so the vector/vchord types resolve.
|
||||||
# 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
|
set -e
|
||||||
|
|
||||||
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
|
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
|
||||||
|
HBA='/var/lib/postgresql/data/pg_hba.conf'
|
||||||
export PGPASSWORD=$(cat "${POSTGRES_PASSWORD_FILE:-/run/secrets/db_password}")
|
export PGPASSWORD=$(cat "${POSTGRES_PASSWORD_FILE:-/run/secrets/db_password}")
|
||||||
DB_USER="${POSTGRES_USER:-postgres}"
|
DB_USER="${POSTGRES_USER:-postgres}"
|
||||||
DB_NAME="${POSTGRES_DB:-immich}"
|
DB_NAME="${POSTGRES_DB:-immich}"
|
||||||
|
|
||||||
function backup {
|
function backup {
|
||||||
pg_dump --clean --if-exists -U "$DB_USER" "$DB_NAME" | gzip > "$BACKUP_FILE"
|
pg_dump -U "$DB_USER" "$DB_NAME" | gzip > "$BACKUP_FILE"
|
||||||
}
|
}
|
||||||
|
|
||||||
function restore {
|
function restore {
|
||||||
|
restore_hba() {
|
||||||
|
if [ -f "${HBA}.ccci.bak" ]; then
|
||||||
|
cat "${HBA}.ccci.bak" > "$HBA"
|
||||||
|
rm -f "${HBA}.ccci.bak"
|
||||||
|
psql -U "$DB_USER" -d postgres -c "SELECT pg_reload_conf();" >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
trap restore_hba EXIT INT TERM
|
||||||
|
|
||||||
|
# Lock the networked app out for the restore: local-trust-only pg_hba + reload rejects all TCP
|
||||||
|
# connections, then terminate the ones it already holds so DROP DATABASE can proceed.
|
||||||
|
cp "$HBA" "${HBA}.ccci.bak"
|
||||||
|
printf 'local all all trust\n' > "$HBA"
|
||||||
|
psql -U "$DB_USER" -d postgres -c "SELECT pg_reload_conf();"
|
||||||
|
psql -U "$DB_USER" -d postgres -c \
|
||||||
|
"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='${DB_NAME}' AND pid<>pg_backend_pid();"
|
||||||
|
|
||||||
|
psql -U "$DB_USER" -d postgres -c "DROP DATABASE ${DB_NAME} WITH (FORCE);"
|
||||||
|
createdb -U "$DB_USER" "$DB_NAME"
|
||||||
gunzip -c "$BACKUP_FILE" \
|
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" \
|
| 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 -
|
| psql -U "$DB_USER" -d "$DB_NAME" --single-transaction --set ON_ERROR_STOP=on
|
||||||
|
|
||||||
|
restore_hba
|
||||||
|
trap - EXIT INT TERM
|
||||||
}
|
}
|
||||||
|
|
||||||
$@
|
$@
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
upgrade to immich 3 successfully deployed, but perhaps better check https://immich.app/blog/v3-migration if it affects your deployment
|
|
||||||
Reference in New Issue
Block a user