add postgres 14 15 and 16 backup versions

.github/workflows/main.yml

@@ -22,6 +22,9 @@ jobs:
       pg11: ${{ steps.filter.outputs.pg11 }}
       pg12: ${{ steps.filter.outputs.pg12 }}
       pg13: ${{ steps.filter.outputs.pg13 }}
+      pg14: ${{ steps.filter.outputs.pg14 }}
+      pg15: ${{ steps.filter.outputs.pg15 }}
+      pg16: ${{ steps.filter.outputs.pg16 }}
 
     steps:
     - name: Checkout 📦
@@ -42,6 +45,12 @@ jobs:
             - '12/**'
           pg13:
             - '13/**'
+          pg14:
+            - '14/**'
+          pg15:
+            - '15/**'
+          pg16:
+            - '16/**'
 
   # Job for Docker Build and Push
   build:
@@ -62,6 +71,9 @@ jobs:
         pg11=${{ needs.changes.outputs.pg11 }}
         pg12=${{ needs.changes.outputs.pg12 }}
         pg13=${{ needs.changes.outputs.pg13 }}
+        pg14=${{ needs.changes.outputs.pg14 }}
+        pg15=${{ needs.changes.outputs.pg15 }}
+        pg16=${{ needs.changes.outputs.pg16 }}
 
         if [[ $pg9 == true ]]; then
          VERSION="9.6"
@@ -73,6 +85,12 @@ jobs:
          VERSION="12"
         elif [[ $pg13 == true ]]; then
          VERSION="13"
+        elif [[ $pg14 == true ]]; then
+         VERSION="14"
+        elif [[ $pg15 == true ]]; then
+         VERSION="15"
+        elif [[ $pg15 == true ]]; then
+         VERSION="16"
         fi
         TAGS="${DOCKER_IMAGE}:${VERSION}"
         echo ::set-output name=subdir::${VERSION}

10/README.md

@@ -185,4 +185,4 @@ Further changes:
 ## Credits
 
 * Tim Sutton ([email protected]) for https://github.com/kartoza/docker-pg-backup - Consulted Oct 2018
-* Just van den Broecke (https://justobjects.nl) - this version - 2018-2021
+* Just van den Broecke (https://justobjects.nl) - this version - 2018

10/build.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-# Local build.
 docker build -t justb4/pgbackup:10 .

11/build.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-#
 docker build -t justb4/pgbackup:11 .

12/build.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-#
 docker build -t justb4/pgbackup:12 .

13/build.sh

@@ -1,3 +1,2 @@
 #!/bin/bash
-#
 docker build -t justb4/pgbackup:13 .

14/Dockerfile

@@ -0,0 +1,11 @@
+FROM postgres:14-alpine
+
+LABEL maintainer="Just van den Broecke <[email protected]>"
+
+RUN apk add --no-cache --update gettext python3 py3-pip && pip3 install click docker && mkdir /pgbackup
+
+ENV PGB_SCHEDULE 0 23 * * *
+
+ADD docker/* /pgbackup/
+
+CMD ["/pgbackup/entrypoint.sh"]

14/README.md

@@ -0,0 +1,188 @@
+# Docker PG Backup
+
+Inspired by: https://github.com/kartoza/docker-pg-backup
+
+A Docker container that runs automated scheduled PostgreSQL/PostGIS backups for all
+PostgreSQL-based Docker Containers in its network that have the Label `"pgbackup.enable=true"`. 
+
+It should work with
+the following PostgreSQL/PostGIS Docker images:
+
+* [mdillon/postgis](https://hub.docker.com/r/mdillon/postgis/)
+* [Kartoza docker postgis](https://github.com/kartoza//docker-postgis) 
+* [Standard PostgreSQL Docker image](https://hub.docker.com/_/postgres/)
+
+Any other PostgreSQL/PostGIS image may work as long as its Container has the `POSTGRES_` environment
+variables set (see below).
+
+By default it will create a backup once per night (at 23:00) in a 
+nicely ordered directory by container-name/year/month, but you can specify your own schedule.
+
+* Docker hub at: https://registry.hub.docker.com/u/justb4/pgbackup/
+* Github at: https://github.com/justb4/docker-pgbackup
+
+## Getting the image
+
+There are various ways to get the image onto your system:
+
+The preferred way (but using most bandwidth for the initial image) is to
+get our docker trusted build like this:
+
+
+```
+docker pull justb4/pgbackup:14
+
+```
+
+We highly suggest that you use a tagged image as 
+latest may change and may not successfully back up your database. Use the same or 
+greater version of postgis as the database you are backing up.
+To build the image yourself:
+
+```
+docker build -t justb4/pgbackup .
+```
+
+If you do not wish to do a local checkout first then build directly from github.
+
+```
+git clone git://github.com/justb4/docker-pgbackup
+```
+
+## Environment Variables 
+
+* `PGB_SCHEDULE`, crontab schedule line,  if not set, defaults to : `0 23 * * *`
+
+## Run Backups
+
+To create a running container do:
+
+```
+docker run --name="pgbackup"\
+           -v backup:/backup -v /var/run/docker.sock:/var/run/docker.sock \
+           -i -d justb4/pgbackup:14
+```
+           
+In this example a local dir (`./backup`) is mounted inti which the actual backups will be
+stored.
+
+Best is to use docker-compose, below the as used
+for testing, with a schedule that backs up once a minute.
+
+
+```
+# Test for pgbackup with sample db
+version: "3"
+
+services:
+  db:
+    image: mdillon/postgis:14-alpine
+    container_name: pg_db_14
+    labels:
+      - "pgbackup.enable=true"
+    environment:
+      - POSTGRES_DB=testdb
+      - POSTGRES_USER=testuser
+      - POSTGRES_PASSWORD=testpass
+
+  dbbackup:
+    image: justb4/pgbackup:14
+    container_name: pg_backup_14
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./backup:/backup
+    environment:
+      - PGB_SCHEDULE=*/1 * * * *
+  
+```
+
+Then run using:
+
+```
+docker-compose up -d
+```
+
+It is advised to use explicit DB-container-naming, as backups will be stored in
+subdirectories (`year/month/<DB-container-name>-ymd-hm.sql.gz`).
+
+## Explicit Backups
+
+You can also run backups (and restores) explicitly, by calling `exec` on the `justb4/pgbackup` 
+container, assuming `pgbackup` here.
+
+Backup all DBs containers:
+
+```
+docker exec -it pgbackup /pgbackup/backup-all.sh
+
+```
+
+Or you can backup a single DB container:
+
+```
+docker exec -it pgbackup /pgbackup/backup.sh <DB container-name> <backup file.sql.gz>
+
+
+# example
+docker exec -it pgbackup /pgbackup/backup.sh pgdb /backup/mybackup.sql.gz
+
+```
+
+## List Backups
+
+You can list all backups available in the container:
+
+```
+docker exec -it pgbackup /pgbackup/list-backups.sh
+
+```
+
+## Restoring Backups
+
+This Docker Image also provides restore utilities.
+
+You can `bash` into the `justb4/pgbackup` container and run `restore.sh` or other commands
+from there. The following steps are needed:
+
+* if not already present copy your backup file, assuming `/backup/mybackup.sql.gz` here, into the `pgbackup` container mounted volume
+* figure out the name of your `justb4/pgbackup` container, assuming `pgbackup` here
+* figure out the name of your target DB container, assuming `pgdb` here
+* `bash` into the container: `docker exec -it pgbackup /bin/bash`
+* execute restore: `/pgbackup/restore.sh /backup/mybackup.sql.gz pgdb`
+
+You could also `exec` directly. Below an example:
+
+```
+docker exec -it pgbackup /pgbackup/restore.sh pgdb /backup/2018/10/pgdb-181013-1050.sql.gz
+
+```
+
+## Design and diffs with kartoza/pg-backup
+
+Main difference is that `justb4/pgbackup` uses the Docker API to search within its Docker Network for
+Containers that have the Label `"pgbackup.enable=true"`. Using Labels in conjunction with the Docker API
+is found in many modern Docker-based services, like e.g. Traefik and Kubernetes.
+
+Each Container to be backed up is then further inspected to get the PostgreSQL credentials
+needed to connect with PG tools like `psql`. The Container name will be the PG Hostname 
+(TODO: figure out IP address via Docker API,
+such that single backup/restores can be run commandline).
+
+This has the following advantages:
+
+* loose coupling, easy to setup
+* one `pgbackup` Container can backup multiple PostgreSQL Containers
+* no need to configure `pgbackup` with all PG credentials 
+
+Further changes:
+
+* works with multiple Docker images for both PostgreSQL and PostGIS (mdillon and kartoza)
+* using smaller `postgres:<version>-alpine` as base image (i.s.o. `kartoza/postgis`)
+* schedule via env var `PGB_SCHEDULE`
+* dumps in SQL gzip format (more portable among PG versions) but may become option in futre
+* includes restore command to restore backup file in a named container
+
+## Credits
+
+* Tim Sutton ([email protected]) for https://github.com/kartoza/docker-pg-backup - Consulted Oct 2018
+* Just van den Broecke (https://justobjects.nl) - this version - 2018

14/build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker build -t justb4/pgbackup:14 .

14/docker/backup-all.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "START Backup"
+
+pushd /pgbackup
+	python3 pgbackup.py --backupdir /backup backup-all
+popd
+
+echo "END Backup"

14/docker/backup.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+echo "START Backup single DB"
+
+# stop on errors
+set -e
+
+# check that we have right number of arguments
+if [[ ! $# -eq 2 ]]
+then
+    echo 'usage:'
+    echo '    /pgbackup/backup.sh <container_name> <backup-file>'
+    echo ''
+    echo 'to get a list of available backups, run:'
+    echo '    /pgbackup/list-backups.sh'
+    exit 1
+fi
+
+# set the container name variable
+CONTAINERNAME=$1
+
+# set the backupfile variable
+BACKUPFILE=$2
+
+echo "Backing up ${CONTAINERNAME} to ${BACKUPFILE}"
+
+pushd /pgbackup
+	python3 pgbackup.py --filepath ${BACKUPFILE} --containername ${CONTAINERNAME} backup
+popd
+
+echo "END Backup"

14/docker/cronfile-template

@@ -0,0 +1,4 @@
+# Schedule supplied via env var
+${PGB_SCHEDULE} /pgbackup/backup-all.sh 2>&1
+
+# We need a blank line here for it to be a valid cron file

14/docker/entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+PGB_SCHEDULE=${PGB_SCHEDULE:='0 23 * * *'}
+
+pushd /pgbackup
+
+envsubst < cronfile-template  > backup-cron
+
+# Now launch cron in then foreground.
+echo "Launching /usr/sbin/crond in foregound with schedule:"
+cat backup-cron
+crontab backup-cron
+/usr/sbin/crond -f -S -l 0

14/docker/list-backups.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "listing available backups"
+echo "-------------------------"
+find /backup -type f -name '*.sql.gz'