Merge branch 'eeshugerman:master' into master

Author: ibot3

.github/workflows/build-and-push-images.yml

@@ -10,11 +10,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - { postgres: 11, alpine: '3.10' }
           - { postgres: 12, alpine: '3.12' }
           - { postgres: 13, alpine: '3.14' }
           - { postgres: 14, alpine: '3.16' }
           - { postgres: 15, alpine: '3.17' }
+          - { postgres: 16, alpine: '3.19' }
 
     steps:
       - name: Checkout repository

README.md

@@ -6,13 +6,13 @@ This project provides Docker images to periodically back up a PostgreSQL databas
 ```yaml
 services:
   postgres:
-    image: postgres:13
+    image: postgres:16
     environment:
       POSTGRES_USER: user
       POSTGRES_PASSWORD: password
 
   backup:
-    image: eeshugerman/postgres-backup-s3:15
+    image: eeshugerman/postgres-backup-s3:16
     environment:
       SCHEDULE: '@weekly'     # optional
       BACKUP_KEEP_DAYS: 7     # optional
@@ -28,20 +28,25 @@ services:
       POSTGRES_PASSWORD: password
 ```
 
-- Images are tagged by the major PostgreSQL version supported: `11`, `12`, `13`, `14`, or `15`.
+- Images are tagged by the major PostgreSQL version supported: `12`, `13`, `14`, `15` or `16`.
 - The `SCHEDULE` variable determines backup frequency. See go-cron schedules documentation [here](http://godoc.org/github.com/robfig/cron#hdr-Predefined_schedules). Omit to run the backup immediately and then exit.
 - If `PASSPHRASE` is provided, the backup will be encrypted using GPG.
 - Run `docker exec <container name> sh backup.sh` to trigger a backup ad-hoc.
 - If `BACKUP_KEEP_DAYS` is set, backups older than this many days will be deleted from S3.
 - Set `S3_ENDPOINT` if you're using a non-AWS S3-compatible storage provider.
 
 ## Restore
-> **WARNING:** DATA LOSS! All database objects will be dropped and re-created.
+> [!CAUTION]
+> DATA LOSS! All database objects will be dropped and re-created.
+
 ### ... from latest backup
 ```sh
 docker exec <container name> sh restore.sh
 ```
-> **NOTE:** If your bucket has more than a 1000 files, the latest may not be restored -- only one S3 `ls` command is used
+
+> [!NOTE]
+> If your bucket has more than a 1000 files, the latest may not be restored -- only one S3 `ls` command is used
+
 ### ... from specific backup
 ```sh
 docker exec <container name> sh restore.sh <timestamp>

src/backup.sh

@@ -19,6 +19,7 @@ s3_uri_base="s3://${S3_BUCKET}/${S3_PREFIX}/${POSTGRES_DATABASE}_${timestamp}.du
 
 if [ -n "$PASSPHRASE" ]; then
   echo "Encrypting backup..."
+  rm -f db.dump.gpg
   gpg --symmetric --batch --passphrase "$PASSPHRASE" db.dump
   rm db.dump
   local_file="db.dump.gpg"

src/install.sh

@@ -11,9 +11,7 @@ apk add postgresql-client
 # install gpg
 apk add gnupg
 
-apk add python3
-apk add py3-pip  # separate package on edge only
-pip3 install awscli
+apk add aws-cli
 
 # install go-cron
 apk add curl