From b84d96549826de3579ec7d3b87118e53113a06f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Mon, 8 Aug 2022 10:02:27 +0200 Subject: [PATCH] [ENH] update backup image and command --- files/Dockerfile-backup | 9 ++++----- templates/backup.yaml.j2 | 5 +---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/files/Dockerfile-backup b/files/Dockerfile-backup index d9d4e52..af91fcb 100644 --- a/files/Dockerfile-backup +++ b/files/Dockerfile-backup @@ -1,6 +1,5 @@ -FROM index.docker.io/tecnativa/duplicity +# Until https://github.com/Tecnativa/docker-duplicity/pull/324 is merged +FROM remifilament/duplicity:latest +# Once https://github.com/Tecnativa/docker-duplicity/pull/324 is merged +# FROM ghcr.io/tecnativa/docker-duplicity:master RUN apk add --no-cache mysql-client -ENV JOB_200_WHAT='mysqldump -h ${MYSQL_HOST} -u ${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} --result-file="$SRC/mysql_${MYSQL_HOST}_${MYSQL_DATABASE}.sql"' \ - JOB_200_WHEN='daily' \ - JOB_700_WHAT='rm "$SRC/mysql_${MYSQL_HOST}_${MYSQL_DATABASE}.sql"' \ - JOB_700_WHEN='daily' diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2 index a2e4c65..3b22e35 100644 --- a/templates/backup.yaml.j2 +++ b/templates/backup.yaml.j2 @@ -20,13 +20,10 @@ services: SWIFT_TENANTNAME: "{{ swift_cloud_tenantname }}" SWIFT_TENANTID: "{{ swift_cloud_tenantid }}" SWIFT_REGIONNAME: "{{ swift_cloud_regionname }}" - JOB_200_WHEN: "weekly" - JOB_300_WHAT: "dup full $$SRC $$DST" + JOB_300_WHAT: "mysqldump -h $$MYSQL_HOST -u $$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE --result-file='$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql' && dup full $$SRC $$DST && rm '$$SRC/mysql_$${MYSQL_HOST}_$$MYSQL_DATABASE.sql'" JOB_300_WHEN: "weekly" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "weekly" - JOB_700_WHEN: "weekly" - OPTIONS: "--allow-source-mismatch" volumes: - nextcloud_nextcloud:/mnt/backup/src/nextcloud:z networks: -- GitLab