From cd2d7f173550adee64c89d20448eb19012da4170 Mon Sep 17 00:00:00 2001
From: Martin Gruner <mg@zammad.com>
Date: Mon, 28 Aug 2023 12:34:07 +0200
Subject: [PATCH] Follow-up: cb6a82de9dc6e9f08ed6e5413c31e31e3085fbaa - Repair
 and improve zammad-backup. (#370)

- Switch back to postgres container for zammad-backup
- Add command passthrough for more convenient container usage/testing
- Add default value handling for HOLD_DAYS variable
---
 docker-compose.yml |  3 ++-
 scripts/backup.sh  | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 05ea719..3efdbe4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,6 @@ x-shared:
 services:
 
   zammad-backup:
-    <<: *zammad-service
     command: ["zammad-backup"]
     depends_on:
       - zammad-railsserver
@@ -38,6 +37,8 @@ services:
       - POSTGRESQL_USER=${POSTGRES_USER}
       - POSTGRESQL_PASS=${POSTGRES_PASS}
       - POSTGRESQL_PORT=${POSTGRES_PORT}
+    image: postgres:${POSTGRES_VERSION}
+    restart: ${RESTART}
     volumes:
       - zammad-backup:/var/tmp/zammad
       - zammad-var:/opt/zammad/var:ro
diff --git a/scripts/backup.sh b/scripts/backup.sh
index 238ccdd..a8596a8 100755
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -5,6 +5,7 @@ set -e
 : "${ZAMMAD_DIR:=/opt/zammad/var}"
 : "${BACKUP_DIR:=/var/tmp/zammad}"
 : "${BACKUP_TIME:=03:00}"
+: "${HOLD_DAYS:=10}"
 : "${ZAMMAD_RAILSSERVER_HOST:=zammad-railsserver}"
 : "${ZAMMAD_RAILSSERVER_PORT:=3000}"
 : "${POSTGRESQL_DB:=zammad_production}"
@@ -57,16 +58,17 @@ if [ "$1" = 'zammad-backup' ]; then
 
     sleep $((NEXT_TIMESTAMP - NOW_TIMESTAMP))
   done
-fi
 
-if [ "$1" = 'zammad-backup-once' ]; then
+elif [ "$1" = 'zammad-backup-once' ]; then
   check_railsserver_available
 
   zammad_backup
-fi
 
-if [ "$1" = 'zammad-backup-db' ]; then
+elif [ "$1" = 'zammad-backup-db' ]; then
   NO_FILE_BACKUP="yes"
 
   zammad_backup
+
+else
+  exec "$@"
 fi