Compare commits
9 Commits
1.4.0+v2.6
...
ci/regall-
| Author | SHA1 | Date | |
|---|---|---|---|
| 5ac2d8526d | |||
| 6a8c2fc560 | |||
| 17f1649c2d | |||
| eafa87d4d1 | |||
| d561baaf06 | |||
| 107d7220ad | |||
| 7eb3937a82 | |||
| 3ba3dd4d7e | |||
| 98a6417815 |
@ -45,4 +45,4 @@ You can manually create a volume that has more storage for the library. For exam
|
||||
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).
|
||||
The external storage will be mounted to `/mnt/external_storage` (this is your import path in immich).
|
||||
|
||||
30
compose.yml
30
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: ghcr.io/immich-app/immich-server:v2.6.3
|
||||
image: ghcr.io/immich-app/immich-server:v2.7.5
|
||||
volumes:
|
||||
- uploads:/usr/src/app/upload
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
@ -19,18 +19,21 @@ services:
|
||||
- proxy
|
||||
- backend
|
||||
healthcheck:
|
||||
disable: false
|
||||
test: ["CMD-SHELL", "immich-healthcheck"]
|
||||
start_period: 120s
|
||||
depends_on:
|
||||
- redis
|
||||
- database
|
||||
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.5.0+v2.6.3"
|
||||
- "coop-cloud.${STACK_NAME}.version=1.8.0+v2.7.5"
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
- "backupbot.volumes.model-cache=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
|
||||
image: ghcr.io/immich-app/immich-machine-learning:v2.6.3
|
||||
image: ghcr.io/immich-app/immich-machine-learning:v2.7.5
|
||||
volumes:
|
||||
- model-cache:/cache
|
||||
networks:
|
||||
@ -47,14 +50,14 @@ services:
|
||||
disable: false
|
||||
|
||||
redis:
|
||||
image: docker.io/valkey/valkey:9@sha256:3eeb09785cd61ec8e3be35f8804c8892080f3ca21934d628abc24ee4ed1698f6
|
||||
image: docker.io/valkey/valkey:9@sha256:3b55fbaa0cd93cf0d9d961f405e4dfcc70efe325e2d84da207a0a8e6d8fde4f9
|
||||
healthcheck:
|
||||
test: redis-cli ping || exit 1
|
||||
networks:
|
||||
- backend
|
||||
|
||||
database:
|
||||
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
|
||||
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.3.0@sha256:87c050465fb969a68c7ac23e375e21f4c95cfacd0edce5fa1bc31e63b7891891
|
||||
environment:
|
||||
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
|
||||
POSTGRES_USER: ${DB_USERNAME}
|
||||
@ -67,6 +70,21 @@ services:
|
||||
- postgres:/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:
|
||||
|
||||
27
pg_backup.sh
Executable file
27
pg_backup.sh
Executable file
@ -0,0 +1,27 @@
|
||||
#!/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 -
|
||||
}
|
||||
|
||||
$@
|
||||
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