From a12c5f51e2b3b78ddb7582ea1aa7f4c7cb4c6c6b Mon Sep 17 00:00:00 2001
From: atcommander <matthewdominic-github@dennerts.net>
Date: Fri, 24 Jun 2022 14:38:11 +0000
Subject: [PATCH] Updated to handle the new scripts flags Updated to run
 backups and cleanup at different times

---
 alpine.Dockerfile | 6 ++++--
 debian.Dockerfile | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
index d6cbe2a..4bbe1ec 100644
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -20,7 +20,8 @@ ENV POSTGRES_DB="**None**" \
     POSTGRES_PASSFILE_STORE="**None**" \
     POSTGRES_EXTRA_OPTS="-Z6" \
     POSTGRES_CLUSTER="FALSE" \
-    SCHEDULE="@daily" \
+    BACKUP_SCHEDULE="@daily" \
+    CLEANUP_SCHEDULE="0 0 1 * * *" \
     BACKUP_DIR="/backups" \
     BACKUP_SUFFIX=".sql.gz" \
     BACKUP_KEEP_DAYS="7" \
@@ -38,7 +39,8 @@ COPY backup.sh /backup.sh
 VOLUME /backups
 
 ENTRYPOINT ["/bin/sh", "-c"]
-CMD ["exec /usr/local/bin/go-cron -s \"$SCHEDULE\" -p \"$HEALTHCHECK_PORT\" -- /backup.sh"]
+CMD ["exec /usr/local/bin/go-cron -s \"$BACKUP_SCHEDULE\" -p \"$HEALTHCHECK_PORT\" -- /backup.sh -b"]
+CMD ["exec /usr/local/bin/go-cron -s \"$CLEANUP_SCHEDULE\" -p \"$HEALTHCHECK_PORT\" -- /backup.sh -c"]
 
 HEALTHCHECK --interval=5m --timeout=3s \
   CMD curl -f "http://localhost:$HEALTHCHECK_PORT/" || exit 1
diff --git a/debian.Dockerfile b/debian.Dockerfile
index ab7a0c1..99d3578 100644
--- a/debian.Dockerfile
+++ b/debian.Dockerfile
@@ -35,7 +35,8 @@ ENV POSTGRES_DB="**None**" \
     POSTGRES_PASSFILE_STORE="**None**" \
     POSTGRES_EXTRA_OPTS="-Z6" \
     POSTGRES_CLUSTER="FALSE" \
-    SCHEDULE="@daily" \
+    BACKUP_SCHEDULE="@daily" \
+    CLEANUP_SCHEDULE="0 0 1 * * *" \
     BACKUP_DIR="/backups" \
     BACKUP_SUFFIX=".sql.gz" \
     BACKUP_KEEP_DAYS="7" \
@@ -53,7 +54,8 @@ COPY backup.sh /backup.sh
 VOLUME /backups
 
 ENTRYPOINT ["/bin/sh", "-c"]
-CMD ["exec /usr/local/bin/go-cron -s \"$SCHEDULE\" -p \"$HEALTHCHECK_PORT\" -- /backup.sh"]
+CMD ["exec /usr/local/bin/go-cron -s \"$BACKUP_SCHEDULE\" -p \"$HEALTHCHECK_PORT\" -- /backup.sh -b"]
+CMD ["exec /usr/local/bin/go-cron -s \"$CLEANUP_SCHEDULE\" -p \"$HEALTHCHECK_PORT\" -- /backup.sh -c"]
 
 HEALTHCHECK --interval=5m --timeout=3s \
   CMD curl -f "http://localhost:$HEALTHCHECK_PORT/" || exit 1