From 5ab2939eaa7b4832e068de33b059337922452656 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:05:09 +0200 Subject: [PATCH] [ENH] update backup image and remove source mismatch --- templates/backup.yaml.j2 | 4 ++-- templates/backup2.yaml.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2 index b48beb5..c571f08 100644 --- a/templates/backup.yaml.j2 +++ b/templates/backup.yaml.j2 @@ -1,7 +1,8 @@ version: "2.1" services: backup_privatebin: - image: tecnativa/duplicity:postgres + image: remifilament/duplicity:postgres # Until https://github.com/Tecnativa/docker-duplicity/pull/324 is merged + # image: ghcr.io/tecnativa/docker-duplicity-postgres:master # Once https://github.com/Tecnativa/docker-duplicity/pull/324 is merged hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-privatebin environment: DST: "swift://privatebin_{{ inventory_hostname|lower }}" @@ -20,7 +21,6 @@ services: JOB_300_WHAT: "backup --full-if-older-than 6D" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "daily" - OPTIONS: "--allow-source-mismatch" volumes: - privatebin_backup_cache:/root/.cache/duplicity/ - privatebin_data:/mnt/backup/src/privatebin:z diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2 index 82ca5ae..d248093 100644 --- a/templates/backup2.yaml.j2 +++ b/templates/backup2.yaml.j2 @@ -1,7 +1,8 @@ version: "2.1" services: backup_privatebin: - image: tecnativa/duplicity:postgres + image: remifilament/duplicity:postgres # Until https://github.com/Tecnativa/docker-duplicity/pull/324 is merged + # image: ghcr.io/tecnativa/docker-duplicity-postgres:master # Once https://github.com/Tecnativa/docker-duplicity/pull/324 is merged hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-privatebin environment: DST: "swift://privatebin_{{ inventory_hostname|lower }}" @@ -20,7 +21,6 @@ services: JOB_300_WHAT: "backup --full-if-older-than 6D" JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@" JOB_302_WHEN: "daily" - OPTIONS: "--allow-source-mismatch" volumes: - privatebin_backup2_cache:/root/.cache/duplicity/ - privatebin_data:/mnt/backup/src/privatebin:z -- GitLab