From b9a34e26ffddf5e9fbb4b567fb5878910cafbccd Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Fri, 21 Nov 2025 23:05:51 +0800
Subject: [PATCH 1/2] use the AWS CLI instead of s3cmd

---
 Dockerfile             | 33 +++++++++++----------------------
 application/backup.sh  | 14 ++++++--------
 application/restore.sh |  4 ++--
 3 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c759fd..2bde1fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,17 @@
-# With Python 3.12.4 on Alpine 3.20, s3cmd 2.4.0 fails with an AttributeError.
-# See ITSE-1440 for details.
 FROM python:3.12.4-alpine
 
-# Current version of s3cmd is in edge/testing repo
-RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
+RUN <<EOF
+  apk update
+  apk add --no-cache \
+    bash \
+    curl \
+    postgresql14-client \
+    py3-pip
 
-# Install everything via repo because repo & pip installs can break things
-RUN apk update \
- && apk add --no-cache \
-            bash \
-            postgresql14-client \
-            py3-magic \
-            py3-dateutil \
-            curl \
-            jq 
-            
-RUN wget https://github.com/s3tools/s3cmd/archive/refs/tags/v2.4.0.tar.gz \
-            && tar xzf v2.4.0.tar.gz \
-            && cd s3cmd-2.4.0 \
-            && python setup.py install \
-            && cd .. \
-            && rm -rf s3cmd-2.4.0 v2.4.0.tar.gz
-# Install sentry-cli
-RUN curl -sL https://sentry.io/get-cli/ | bash
+  curl -sL https://sentry.io/get-cli/ | bash
+
+  pip3 install awscli
+EOF
 
 COPY application/ /data/
 WORKDIR /data
diff --git a/application/backup.sh b/application/backup.sh
index 6e2e810..da4cb3c 100755
--- a/application/backup.sh
+++ b/application/backup.sh
@@ -121,7 +121,7 @@ fi
 
 # Upload compressed backup file to S3
 start=$(date +%s);
-s3cmd put /tmp/${DB_NAME}.sql.gz ${S3_BUCKET} || STATUS=$?;
+aws s3 cp "/tmp/${DB_NAME}.sql.gz" "s3://${S3_BUCKET}/${DB_NAME}.sql.gz" || STATUS=$
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy backup to ${S3_BUCKET} of ${DB_NAME} returned non-zero status ($STATUS) in $(expr ${end} - ${start}) seconds.";
     log "ERROR" "${error_message}";
@@ -130,7 +130,7 @@ if [ $STATUS -ne 0 ]; then
 fi
 
 # Upload checksum file
-s3cmd put /tmp/${DB_NAME}.sql.sha256.gz ${S3_BUCKET} || STATUS=$?;
+aws s3 cp "/tmp/${DB_NAME}.sql.sha256.gz" "s3://${S3_BUCKET}/${DB_NAME}.sql.sha256.gz" || STATUS=$?;
 end=$(date +%s);
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy checksum to ${S3_BUCKET} of ${DB_NAME} returned non-zero status ($STATUS).";
@@ -144,12 +144,10 @@ fi
 # Backblaze B2 Upload
 if [ "${B2_BUCKET}" != "" ]; then
     start=$(date +%s);
-    s3cmd \
-    --access_key=${B2_APPLICATION_KEY_ID} \
-    --secret_key=${B2_APPLICATION_KEY} \
-    --host=${B2_HOST} \
-    --host-bucket='%(bucket)s.'"${B2_HOST}" \
-    put /tmp/${DB_NAME}.sql.gz s3://${B2_BUCKET}/${DB_NAME}.sql.gz;
+    AWS_ACCESS_KEY_ID="${B2_APPLICATION_KEY_ID}" \
+    AWS_SECRET_ACCESS_KEY="${B2_APPLICATION_KEY}" \
+    aws s3 cp "/tmp/${DB_NAME}.sql.gz" "s3://${B2_BUCKET}/${DB_NAME}.sql.gz" \
+      --endpoint-url "https://${B2_HOST}"
     STATUS=$?;
     end=$(date +%s);
     if [ $STATUS -ne 0 ]; then
diff --git a/application/restore.sh b/application/restore.sh
index 176bc50..8bcd389 100755
--- a/application/restore.sh
+++ b/application/restore.sh
@@ -95,7 +95,7 @@ log "INFO" "${MYNAME}: copying database ${DB_NAME} backup and checksum from ${S3
 start=$(date +%s)
 
 # Download database backup
-s3cmd get -f ${S3_BUCKET}/${DB_NAME}.sql.gz /tmp/${DB_NAME}.sql.gz || STATUS=$?
+aws s3 cp s3://${S3_BUCKET}/${DB_NAME}.sql.gz /tmp/${DB_NAME}.sql.gz || STATUS=$?
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy backup of ${DB_NAME} from ${S3_BUCKET} returned non-zero status ($STATUS) in $(expr $(date +%s) - ${start}) seconds."
     log "ERROR" "${error_message}"
@@ -104,7 +104,7 @@ if [ $STATUS -ne 0 ]; then
 fi
 
 # Download checksum file
-s3cmd get -f ${S3_BUCKET}/${DB_NAME}.sql.sha256.gz /tmp/${DB_NAME}.sql.sha256.gz || STATUS=$?
+aws s3 cp s3://${S3_BUCKET}/${DB_NAME}.sql.sha256.gz /tmp/${DB_NAME}.sql.sha256.gz || STATUS=$?
 end=$(date +%s)
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy checksum of ${DB_NAME} from ${S3_BUCKET} returned non-zero status ($STATUS) in $(expr ${end} - ${start}) seconds."

From 96eda4399c52d074fc03978a85bc306c41cb7a45 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Mon, 24 Nov 2025 14:25:19 +0800
Subject: [PATCH 2/2] add missing `?` deleted by accident

Co-authored-by: Michael Wilson <70765247+hobbitronics@users.noreply.github.com>
---
 application/backup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/backup.sh b/application/backup.sh
index da4cb3c..56398c8 100755
--- a/application/backup.sh
+++ b/application/backup.sh
@@ -121,7 +121,7 @@ fi
 
 # Upload compressed backup file to S3
 start=$(date +%s);
-aws s3 cp "/tmp/${DB_NAME}.sql.gz" "s3://${S3_BUCKET}/${DB_NAME}.sql.gz" || STATUS=$
+aws s3 cp "/tmp/${DB_NAME}.sql.gz" "s3://${S3_BUCKET}/${DB_NAME}.sql.gz" || STATUS=$?
 if [ $STATUS -ne 0 ]; then
     error_message="${MYNAME}: FATAL: Copy backup to ${S3_BUCKET} of ${DB_NAME} returned non-zero status ($STATUS) in $(expr ${end} - ${start}) seconds.";
     log "ERROR" "${error_message}";