diff --git a/compose.yml b/compose.yml index 83a010f..0d9e3d1 100644 --- a/compose.yml +++ b/compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: app: - image: mattermost/mattermost-team-edition:10.11.18 + image: mattermost/mattermost-team-edition:10.11.19 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.10+10.11.18" + - "coop-cloud.${STACK_NAME}.version=2.1.11+10.11.19" - "backupbot.backup=true" - "backupbot.backup.path=/mattermost,/etc/ssl" configs: @@ -58,9 +58,9 @@ services: deploy: labels: backupbot.backup: "true" - 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/" + backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE:-/run/secrets/postgres_password}) pg_dump -U $${POSTGRES_USER:-mattermost} $${POSTGRES_DB:-mattermost} | gzip > /var/lib/postgresql/data/backup.sql" + backupbot.backup.volumes.postgres_data.path: "backup.sql" + backupbot.restore.post-hook: "DB=$${POSTGRES_DB:-mattermost}; U=$${POSTGRES_USER:-mattermost}; export PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE:-/run/secrets/postgres_password}); psql -U $$U -d postgres -c \"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='$$DB' AND pid<>pg_backend_pid();\"; psql -U $$U -d postgres -c \"DROP DATABASE \\\"$$DB\\\" WITH (FORCE);\"; createdb -U $$U $$DB; gunzip -c /var/lib/postgresql/data/backup.sql | psql -U $$U -d $$DB -1 -v ON_ERROR_STOP=1 -f -" secrets: