pg16 for AWS

Author: Zaariel91

Dockerfile

@@ -1,22 +1,12 @@
 FROM alpine:3.18
 
- RUN apk add --update \
- python3 \
- curl \
- which \
- bash
-
- RUN curl -sSL https://sdk.cloud.google.com | bash
-
- ENV PATH $PATH:/root/google-cloud-sdk/bin
-
 RUN apk update \
-    && apk --no-cache add dumb-init postgresql15-client curl
+    && apk --no-cache add dumb-init postgresql-client curl aws-cli
 
 RUN curl -L https://github.com/odise/go-cron/releases/download/v0.0.7/go-cron-linux.gz | zcat > /usr/local/bin/go-cron && chmod +x /usr/local/bin/go-cron
 
 COPY entrypoint.sh .
 COPY backup.sh .
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
-CMD ["sh", "entrypoint.sh"]
+CMD ["sh", "entrypoint.sh"]

backup.sh

@@ -48,41 +48,28 @@ case "${PG_BACKUP_ACTION:-dump}" in
       AWS_ARGS="--endpoint-url ${S3_ENDPOINT}"
     fi
 
-    # Google Cloud Auth
-    echo "Authenticating to Google Cloud..."
-    echo $S3_SECRET_ACCESS_KEY | base64 -d > /key.json
-    gcloud auth activate-service-account --key-file /key.json --project "$S3_ACCESS_KEY_ID" -q
-
     # env vars needed for aws tools
     export AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID
     export AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY
     export AWS_DEFAULT_REGION=$S3_REGION
 
-    # Define a cleanup function
-    cleanup() {
-      echo "Cleaning up..."
-      rm -f dump.backup
-    }
-
-    # Set a trap to call the cleanup function when the script exits
-    trap cleanup EXIT
-
     # TODO: check if database is fresh
     echo "Snapshotting $POSTGRES_DB database"
     pg_dump -Fc $POSTGRES_HOST_OPTS $POSTGRES_DB > dump.backup
+    aws configure set default.s3.multipart_chunksize 16MB
 
     if [ "${PRIVATE_BACKUP}" == "true" ] || [ "${PRIVATE_BACKUP}" == "1"  ]; then
       echo "Rotating old snapshot"
-      gsutil cp gs://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup gs://$S3_BUCKET/$S3_PATH/$S3_FILENAME.old.backup || true
+      aws $AWS_ARGS s3 cp s3://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup s3://$S3_BUCKET/$S3_PATH/$S3_FILENAME.old.backup --acl private || true
 
       echo "Uploading fresh private snapshot to $S3_BUCKET/$S3_PATH/$S3_FILENAME"
-      cat dump.backup | gsutil cp - gs://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup || exit 2
+      cat dump.backup | aws $AWS_ARGS s3 cp - s3://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup --acl private || exit 2
     else
       echo "Rotating old snapshot"
-      gsutil cp -a public-read gs://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup gs://$S3_BUCKET/$S3_PATH/$S3_FILENAME.old.backup || true
+      aws $AWS_ARGS s3 cp s3://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup s3://$S3_BUCKET/$S3_PATH/$S3_FILENAME.old.backup --acl public-read || true
 
       echo "Uploading fresh public snapshot to $S3_BUCKET/$S3_PATH/$S3_FILENAME"
-      cat dump.backup | gsutil cp -a public-read - gs://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup || exit 2
+      cat dump.backup | aws $AWS_ARGS s3 cp - s3://$S3_BUCKET/$S3_PATH/$S3_FILENAME.backup --acl public-read || exit 2
     fi
 
     echo "Snapshot uploaded successfully, removing local file"
@@ -106,3 +93,4 @@ case "${PG_BACKUP_ACTION:-dump}" in
     pg_restore -v -d $POSTGRES_DB $POSTGRES_HOST_OPTS dump.backup
     ;;
 esac
+