Adding subdirectory optional variable.

Author: scottfridwin

Dockerfile

@@ -12,7 +12,7 @@ RUN apk add --no-cache \
           su-exec \
           dcron \
           gzip \
-    && mkdir -p /scripts /backups
+    && mkdir -p /scripts
 
 COPY backup_full.sh /scripts/backup_full.sh
 COPY backup_incremental.sh /scripts/backup_incremental.sh

README.md

@@ -4,8 +4,8 @@ A simple, containerized solution for automated full and incremental backups of a
 
 ## Features
 
-- **Full Backups:** Scheduled `pg_dump` backups of your PostgreSQL database, compressed and stored in `/backups/full`.
-- **Incremental Backups:** Optionally archive PostgreSQL WAL files for point-in-time recovery, stored in `/backups/incremental`.
+- **Full Backups:** Scheduled `pg_dump` backups of your PostgreSQL database, compressed and stored in `/backups/full` or `/backups/$BACKUP_SUBDIR/full`.
+- **Incremental Backups:** Optionally archive PostgreSQL WAL files for point-in-time recovery, stored in `/backups/incremental` or `/backups/$BACKUP_SUBDIR/incremental`.
 - **Retention Policies:** Automatically remove old backups based on configurable retention periods.
 - **Configurable Scheduling:** Use environment variables to control backup intervals via cron.
 - **Easy Integration:** Designed to run as a Docker container, with minimal configuration.
@@ -28,6 +28,7 @@ A simple, containerized solution for automated full and incremental backups of a
 | `RETENTION_INC_DAYS`          | Days to keep incremental backups                         | `3`                    |
 | `BACKUP_FULL_INTERVAL`        | Cron schedule for full backups                           | `0 2 * * 0`            |
 | `BACKUP_INCREMENTAL_INTERVAL` | Cron schedule for incremental backups                    | `0 */6 * * *`          |
+| `BACKUP_SUBDIR`               | Subdirectory for backups to be stored                    | (undefined)            |
 
 ### Volumes
 

backup_full.sh

@@ -1,8 +1,15 @@
 #!/bin/bash
 set -euo pipefail
 
+BACKUP_SUBDIR="${BACKUP_SUBDIR:-}"
+if [ -n "$BACKUP_SUBDIR" ]; then
+    BASE_BACKUP_DIR="/backups/$BACKUP_SUBDIR"
+else
+    BASE_BACKUP_DIR="/backups"
+fi
+
 DATE=$(date +%F_%H-%M-%S)
-DEST_DIR="/backups/full/$DATE"
+DEST_DIR="$BASE_BACKUP_DIR/full/$DATE"
 mkdir -p "$DEST_DIR"
 
 export PGPASSWORD=$(cat $PGPASSWORD_FILE)
@@ -14,6 +21,6 @@ pg_dump -h "${POSTGRES_HOST}" \
         "${POSTGRES_DB}" | gzip > "$DEST_DIR/$BACKUP_NAME.gz"
 
 # Apply retention
-find /backups/full -type d -mtime +${RETENTION_FULL_DAYS} -exec rm -rf {} +
+find $BASE_BACKUP_DIR/full -type d -mtime +${RETENTION_FULL_DAYS} -exec rm -rf {} +
 
 echo "[$(date)] Full backup completed."

backup_incremental.sh

@@ -1,8 +1,15 @@
 #!/bin/bash
 set -euo pipefail
 
+BACKUP_SUBDIR="${BACKUP_SUBDIR:-}"
+if [ -n "$BACKUP_SUBDIR" ]; then
+    BASE_BACKUP_DIR="/backups/$BACKUP_SUBDIR"
+else
+    BASE_BACKUP_DIR="/backups"
+fi
+
 DATE=$(date +%F_%H-%M-%S)
-DEST_DIR="/backups/incremental/$DATE"
+DEST_DIR="$BASE_BACKUP_DIR/incremental/$DATE"
 mkdir -p "$DEST_DIR"
 
 echo "[$(date)] Performing incremental backup..."
@@ -11,7 +18,7 @@ echo "[$(date)] Performing incremental backup..."
 cp /wal_archive/* "$DEST_DIR/" || true
 
 # Apply retention on the incremental backups themselves
-find /backups/incremental -type d -mtime +${RETENTION_INC_DAYS} -exec rm -rf {} +
+find $BASE_BACKUP_DIR/incremental -type d -mtime +${RETENTION_INC_DAYS} -exec rm -rf {} +
 
 # Clean up WAL files using pg_archivecleanup
 # Determine the last WAL file to keep