diff --git a/abra.sh b/abra.sh index 0c68799..11a0a3e 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,2 @@ export ABRA_MATTERMOST_ENTRYPOINT_VERSION=v2 export BUSYBOX_VERSION=v1 - -export PG_BACKUP_VERSION=v1 diff --git a/compose.yml b/compose.yml index 063b2a8..ef1bc64 100644 --- a/compose.yml +++ b/compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: app: - image: mattermost/mattermost-team-edition:11.9.0 + image: mattermost/mattermost-team-edition:11.10.0 environment: - TZ - MM_SQLSETTINGS_DRIVERNAME=postgres @@ -28,7 +28,7 @@ services: - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - - "coop-cloud.${STACK_NAME}.version=2.1.12+10.11.20" + - "coop-cloud.${STACK_NAME}.version=2.1.13+10.11.22" - "backupbot.backup=true" - "backupbot.backup.path=/mattermost,/etc/ssl" configs: @@ -58,13 +58,9 @@ services: deploy: labels: backupbot.backup: "true" - backupbot.backup.pre-hook: "/pg_backup.sh backup" - backupbot.backup.volumes.postgres_data.path: "backup.sql" - backupbot.restore.post-hook: "/pg_backup.sh restore" - configs: - - source: pg_backup - target: /pg_backup.sh - mode: 0555 + backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/postgres-backup.sql" + backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/postgres-backup.sql" + backupbot.backup.path: "/var/lib/postgresql/data/" secrets: @@ -73,9 +69,6 @@ secrets: name: ${STACK_NAME}_postgres_password_${SECRET_POSTGRES_PASSWORD_VERSION} configs: - pg_backup: - name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION} - file: pg_backup.sh abra_mattermost_entrypoint: name: ${STACK_NAME}_entrypoint_${ABRA_MATTERMOST_ENTRYPOINT_VERSION} file: ./entrypoint.sh diff --git a/pg_backup.sh b/pg_backup.sh deleted file mode 100755 index 5c5dca4..0000000 --- a/pg_backup.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Postgres backup/restore hook for the `postgres` service. Invoked by backupbot-two via: -# backupbot.backup.pre-hook = "/pg_backup.sh backup" -# backupbot.backup.volumes.postgres_data.path = "backup.sql" -# backupbot.restore.post-hook = "/pg_backup.sh restore" -# Backup dumps the DB to backup.sql (gzip) inside the postgres volume; backupbot archives it. -# Restore reimports it. The mattermost app keeps TCP connections open to the DB, so restore must -# terminate them and FORCE-drop before recreating, then reimport the dump deterministically — the -# previous recipe shipped no restore hook (file-level PGDATA restore did not reload into the running -# postgres), so a restored backup silently kept the live (un-restored) state. - -set -e - -BACKUP_FILE='/var/lib/postgresql/data/backup.sql' -export PGPASSWORD=$(cat "${POSTGRES_PASSWORD_FILE:-/run/secrets/postgres_password}") -DB_USER="${POSTGRES_USER:-mattermost}" -DB_NAME="${POSTGRES_DB:-mattermost}" - -function backup { - pg_dump -U "$DB_USER" "$DB_NAME" | gzip > "$BACKUP_FILE" -} - -function restore { - 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 - -} - -$@