From 2c2b201437181633de1011047b94b209d8ca8a8c Mon Sep 17 00:00:00 2001
From: Alex Toff <me@alextoff.uk>
Date: Sun, 13 Aug 2023 17:02:13 +0100
Subject: [PATCH] Add support for back file name override

---
 postgres-backup-s3/Dockerfile | 2 +-
 postgres-backup-s3/backup.sh  | 4 ++++
 postgres-backup-s3/install.sh | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/postgres-backup-s3/Dockerfile b/postgres-backup-s3/Dockerfile
index 25acf90..747f90c 100644
--- a/postgres-backup-s3/Dockerfile
+++ b/postgres-backup-s3/Dockerfile
@@ -14,8 +14,8 @@ ENV POSTGRES_EXTRA_OPTS ''
 ENV S3_ACCESS_KEY_ID **None**
 ENV S3_SECRET_ACCESS_KEY **None**
 ENV S3_BUCKET **None**
+ENV S3_FILE_NAME **None**
 ENV S3_REGION us-west-1
-ENV S3_PATH 'backup'
 ENV S3_ENDPOINT **None**
 ENV S3_S3V4 no
 ENV SCHEDULE **None**
diff --git a/postgres-backup-s3/backup.sh b/postgres-backup-s3/backup.sh
index 86af4e9..b42b3aa 100644
--- a/postgres-backup-s3/backup.sh
+++ b/postgres-backup-s3/backup.sh
@@ -94,6 +94,10 @@ else
 
     SRC_FILE=dump.sql.gz
     DEST_FILE=${DB}_$(date +"%Y-%m-%dT%H:%M:%SZ").sql.gz
+
+    if [ "${S3_FILE_NAME}" != "**None**" ]; then
+      DEST_FILE=${S3_FILE_NAME}.sql.gz
+    fi
     
     echo "Creating dump of ${DB} database from ${POSTGRES_HOST}..."
     pg_dump $POSTGRES_HOST_OPTS $DB | gzip > $SRC_FILE
diff --git a/postgres-backup-s3/install.sh b/postgres-backup-s3/install.sh
index 15ca915..5e63e1a 100644
--- a/postgres-backup-s3/install.sh
+++ b/postgres-backup-s3/install.sh
@@ -4,7 +4,8 @@
 set -eo pipefail
 
 apk update
-apk add postgresql-client openssl aws-cli
+apk add openssl aws-cli 
+apk add postgresql-client --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/main
 
 # cleanup
 rm -rf /var/cache/apk/*