Compare commits
4 Commits
1.4.0+v2.6
...
ci/pg-back
| Author | SHA1 | Date | |
|---|---|---|---|
| a846cf38dc | |||
| 7eb3937a82 | |||
| 3ba3dd4d7e | |||
| 98a6417815 |
23
compose.yml
23
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: ghcr.io/immich-app/immich-server:v2.6.3
|
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
|
||||||
@ -30,7 +30,7 @@ services:
|
|||||||
- "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.5.0+v2.6.3"
|
- "coop-cloud.${STACK_NAME}.version=1.6.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"
|
||||||
@ -38,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:v2.6.3
|
image: ghcr.io/immich-app/immich-machine-learning:v2.7.5
|
||||||
volumes:
|
volumes:
|
||||||
- model-cache:/cache
|
- model-cache:/cache
|
||||||
networks:
|
networks:
|
||||||
@ -47,7 +47,7 @@ services:
|
|||||||
disable: false
|
disable: false
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/valkey/valkey:9@sha256:3eeb09785cd61ec8e3be35f8804c8892080f3ca21934d628abc24ee4ed1698f6
|
image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: redis-cli ping || exit 1
|
test: redis-cli ping || exit 1
|
||||||
networks:
|
networks:
|
||||||
@ -67,6 +67,21 @@ services:
|
|||||||
- postgres:/var/lib/postgresql/data
|
- postgres:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- 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:
|
secrets:
|
||||||
db_password:
|
db_password:
|
||||||
|
|||||||
33
pg_backup.sh
Executable file
33
pg_backup.sh
Executable file
@ -0,0 +1,33 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Postgres backup/restore hook for the immich `database` service (VectorChord/pgvecto.rs image).
|
||||||
|
# Invoked by backupbot-two via the deploy labels:
|
||||||
|
# backupbot.backup.pre-hook = "/pg_backup.sh backup"
|
||||||
|
# backupbot.backup.volumes.postgres.path = "backup.sql"
|
||||||
|
# backupbot.restore.post-hook = "/pg_backup.sh restore"
|
||||||
|
# Backup dumps the immich DB to backup.sql (gzip) inside the postgres volume; backupbot then
|
||||||
|
# archives that file. Restore reads it back and reimports. immich-server keeps TCP connections
|
||||||
|
# open to the DB, so restore must terminate them and FORCE-drop before recreating (the matrix-synapse
|
||||||
|
# pg_hba "local trust" trick does not cover networked connections).
|
||||||
|
|
||||||
|
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 -U "$DB_USER" "$DB_NAME" | gzip > "$BACKUP_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
function restore {
|
||||||
|
# immich-server holds connections to the DB; drop them so DROP DATABASE can proceed.
|
||||||
|
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" | psql -U "$DB_USER" -d "$DB_NAME" -1 -v ON_ERROR_STOP=1 -f -
|
||||||
|
}
|
||||||
|
|
||||||
|
$@
|
||||||
1
release/1.5.1+v2.6.3
Normal file
1
release/1.5.1+v2.6.3
Normal file
@ -0,0 +1 @@
|
|||||||
|
patch to fix my tagging screw up
|
||||||
Reference in New Issue
Block a user