Compare commits
16
Commits
a92b28d9ba
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
65ae140f54 | ||
|
|
caaa20fa49 | ||
|
|
794560fdc2 | ||
|
|
d7467e7018 | ||
|
|
77d79379cd | ||
|
|
f652ed331b | ||
|
|
b81694ed70 | ||
|
|
8d74ee6495 | ||
|
|
5bf5bdc4ae | ||
|
|
dff4fd6cb3 | ||
|
|
2dcc1c1a04 | ||
|
|
6b45c97b43 | ||
|
|
17f1649c2d | ||
|
|
eafa87d4d1 | ||
|
|
d561baaf06 | ||
|
|
107d7220ad |
+8
-5
@@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: ghcr.io/immich-app/immich-server:v2.7.5
|
image: ghcr.io/immich-app/immich-server:v3.2.0
|
||||||
volumes:
|
volumes:
|
||||||
- uploads:/usr/src/app/upload
|
- uploads:/usr/src/app/upload
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
@@ -19,18 +19,21 @@ services:
|
|||||||
- proxy
|
- proxy
|
||||||
- backend
|
- backend
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: false
|
test: ["CMD-SHELL", "immich-healthcheck"]
|
||||||
|
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.7.0+v2.7.5"
|
- "coop-cloud.${STACK_NAME}.version=1.10.0+v3.1.0"
|
||||||
- "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"
|
||||||
@@ -38,7 +41,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:v2.7.5
|
image: ghcr.io/immich-app/immich-machine-learning:v3.2.0
|
||||||
volumes:
|
volumes:
|
||||||
- model-cache:/cache
|
- model-cache:/cache
|
||||||
networks:
|
networks:
|
||||||
@@ -47,7 +50,7 @@ services:
|
|||||||
disable: false
|
disable: false
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
|
image: docker.io/valkey/valkey:9@sha256:70739f85ad2ee01a726a965584a0f94895f01b0c60b3cc8b0aeef11eaa6888cf
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: redis-cli ping || exit 1
|
test: redis-cli ping || exit 1
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
+6
-24
@@ -1,29 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Postgres backup/restore hook for the immich `database` service (VectorChord/pgvecto.rs image).
|
# Postgres backup/restore hook for immich's VectorChord/pgvecto.rs `database` service.
|
||||||
# Invoked by backupbot-two via the deploy labels:
|
# Two image-specific constraints:
|
||||||
# backupbot.backup.pre-hook = "/pg_backup.sh backup"
|
# 1. Never DROP DATABASE — the bundled pgvecto.rs worker PANICs and crashes the server.
|
||||||
# backupbot.backup.volumes.postgres.path = "backup.sql"
|
# So `pg_dump --clean --if-exists` does a per-object replace in the live DB on restore.
|
||||||
# backupbot.restore.post-hook = "/pg_backup.sh 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).
|
||||||
# Two image-specific constraints shape this hook, and BOTH are handled:
|
|
||||||
#
|
|
||||||
# 1. NEVER drop the database. immich's image bundles the legacy pgvecto.rs (`vectors`) extension whose
|
|
||||||
# background worker, if its database is dropped, recurses on its own IPC error until postgres aborts
|
|
||||||
# with `PANIC: ERRORDATA_STACK_SIZE exceeded` and crashes the whole server — after which immich can
|
|
||||||
# never reconnect. So we do NOT `DROP DATABASE`. Instead the backup is taken with
|
|
||||||
# `pg_dump --clean --if-exists`, so the dump itself carries a `DROP TABLE IF EXISTS` + recreate +
|
|
||||||
# copy for each object. Restoring it does a per-OBJECT replace inside the live database — stale rows
|
|
||||||
# added since the backup are removed (a true point-in-time restore, not a merge) — without ever
|
|
||||||
# dropping the database, so the pgvecto.rs worker is never destabilised. (Per-table DROP TABLE is
|
|
||||||
# fine; only DROP DATABASE triggers the PANIC.)
|
|
||||||
#
|
|
||||||
# 2. VectorChord search_path. A plain pg_dump emits
|
|
||||||
# SELECT pg_catalog.set_config('search_path', '', false);
|
|
||||||
# near the top; on reimport that empty search_path leaves the vector/vchord types + operator classes
|
|
||||||
# unresolvable. immich's documented restore (https://docs.immich.app/administration/backup-and-restore)
|
|
||||||
# rewrites that line to put `public, pg_catalog` back first — we do the same. ON_ERROR_STOP is left
|
|
||||||
# OFF so a benign hiccup on one object doesn't abort the whole import.
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
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