Upgrade to version 17-3.5

.example.env

@@ -3,6 +3,6 @@
 COMPOSE_PROJECT_NAME=postgis
 
 ## For build arguments
-POSTGRES_MAJOR_VERSION=16
+POSTGRES_MAJOR_VERSION=17
 POSTGIS_MAJOR_VERSION=3
-POSTGIS_MINOR_RELEASE=4
+POSTGIS_MINOR_RELEASE=5

.github/workflows/build-latest.yaml

@@ -4,20 +4,31 @@ on:
   pull_request:
     branches:
       - master
+    paths:
+      - 'Dockerfile'
+      - 'scripts/**'
+      - 'build_data/**'
+      - '.github/workflows/**'
   push:
     branches:
       - master
 jobs:
   run-scenario-tests:
+    if: |
+      github.actor != 'dependabot[bot]' &&
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      )
     runs-on: ubuntu-latest
     strategy:
       matrix:
         postgresMajorVersion:
-          - 16
+          - 17
         postgisMajorVersion:
           - 3
         postgisMinorRelease:
-          - 4
+          - 5
         scenario:
           - restore
           - s3
@@ -56,17 +67,24 @@ jobs:
           bash ./test.sh
 
   push-internal-pr-images:
-    if: github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url
+    if: |
+      github.event_name == 'pull_request' && 
+      github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url && 
+      github.actor != 'dependabot[bot]'  &&
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      )
     runs-on: ubuntu-latest
     needs: [ run-scenario-tests ]
     strategy:
       matrix:
         postgresMajorVersion:
-          - 16
+          - 17
         postgisMajorVersion:
           - 3
         postgisMinorRelease:
-          - 4
+          - 5
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU

.github/workflows/deploy-image.yaml

@@ -10,17 +10,23 @@ on:
       - completed
 jobs:
   deploy-image:
+    if: |
+      github.actor != 'dependabot[bot]' &&
+      !(
+        contains(github.event.pull_request.title, '[skip-release]') ||
+        contains(github.event.comment.body, '/skiprelease')
+      ) && github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     env:
       latest-ref: refs/heads/develop
     strategy:
       matrix:
         postgresMajorVersion:
-          - 16
+          - 17
         postgisMajorVersion:
           - 3
         postgisMinorRelease:
-          - 4
+          - 5
     steps:
       - uses: actions/checkout@v4
       - name: Set up QEMU
@@ -33,15 +39,17 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      
+
       - name: Get Current Date
         id: current_date
-        shell: python
-        run: |
-          import datetime
-          now = datetime.datetime.utcnow()
-          print(f'::set-output name=formatted::{now:%Y.%m.%d}')
+        run: echo "formatted=$(date -u +%Y.%m.%d)" >> $GITHUB_OUTPUT
 
+      - name: Check if image exists on Docker Hub
+        id: check_hub_image_exists
+        run: |
+          docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password ${{ secrets.DOCKERHUB_PASSWORD }}
+          TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "'${{ secrets.DOCKERHUB_USERNAME }}'", "password": "'${{ secrets.DOCKERHUB_PASSWORD }}'"}' https://hub.docker.com/v2/users/login/ | jq -r .token)
+          check_image=$(curl --silent -f --head -lL https://hub.docker.com/v2/repositories/kartoza/pg-backup/tags/${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}/ | head -n 1 | cut -d ' ' -f2) >> $GITHUB_OUTPUT
 
       - name: Build prod image
         id: docker_build_prod
@@ -53,6 +61,7 @@ jobs:
           push: true
           tags: |
             ${{ secrets.DOCKERHUB_REPO }}/pg-backup:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}
+            ${{ steps.check_hub_image_exists.outputs.check_image == 200 && format('{0}/pg-backup:{1}-{2}.{3}', secrets.DOCKERHUB_REPO,  matrix.postgresMajorVersion, matrix.postgisMajorVersion, matrix.postgisMinorRelease) || null}}
             ${{ secrets.DOCKERHUB_REPO }}/pg-backup:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}--v${{ steps.current_date.outputs.formatted }}
           build-args: |
             POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }}

Dockerfile

@@ -1,9 +1,9 @@
 ##############################################################################
 # Production Stage                                                           #
 ##############################################################################
-ARG POSTGRES_MAJOR_VERSION=16
+ARG POSTGRES_MAJOR_VERSION=17
 ARG POSTGIS_MAJOR_VERSION=3
-ARG POSTGIS_MINOR_RELEASE=4
+ARG POSTGIS_MINOR_RELEASE=5
 
 FROM kartoza/postgis:$POSTGRES_MAJOR_VERSION-$POSTGIS_MAJOR_VERSION.${POSTGIS_MINOR_RELEASE} AS postgis-backup-production
 

README.md

@@ -37,13 +37,13 @@ docker pull kartoza/pg-backup:$POSTGRES_MAJOR_VERSION-$POSTGIS_MAJOR_VERSION.${P
 
 Where the environment variables are
 ```
-POSTGRES_MAJOR_VERSION=13
+POSTGRES_MAJOR_VERSION=17
 POSTGIS_MAJOR_VERSION=3
-POSTGIS_MINOR_RELEASE=1 
+POSTGIS_MINOR_RELEASE=5 
 ```
 
 We highly suggest that you use a tagged image that match the PostgreSQL image you are running i.e
-(kartoza/pg-backup:15-3.3 for backing up kartoza/postgis:15-3.3 DB). The
+(kartoza/pg-backup:17-3.5 for backing up kartoza/postgis:17-3.5 DB). The
 latest tag  may change and may not successfully back up your database. 
 
 
@@ -61,9 +61,9 @@ cd docker-pg-backup
 To create a running container do:
 
 ```
-POSTGRES_MAJOR_VERSION=15
+POSTGRES_MAJOR_VERSION=17
 POSTGIS_MAJOR_VERSION=3
-POSTGIS_MINOR_RELEASE=3 
+POSTGIS_MINOR_RELEASE=5 
 docker run --name "db"  -p 25432:5432 -d -t kartoza/postgis:$POSTGRES_MAJOR_VERSION-$POSTGIS_MAJOR_VERSION.${POSTGIS_MINOR_RELEASE}
 docker run --name="backups"  --link db:db -v `pwd`/backups:/backups  -d kartoza/pg-backup:$POSTGRES_MAJOR_VERSION-$POSTGIS_MAJOR_VERSION.${POSTGIS_MINOR_RELEASE}
 ```
@@ -85,8 +85,8 @@ databases.
 * `REMOVE_BEFORE` remove all old backups older than specified amount of days, e.g. `30` would 
 only keep backup files younger than 30 days. Default: no files are ever removed.
 * `DUMP_ARGS` The default dump arguments based on official 
-  [PostgreSQL Dump options](https://www.postgresql.org/docs/13/app-pgdump.html).
-* `RESTORE_ARGS` Additional restore commands based on official [PostgreSQL restore](https://www.postgresql.org/docs/13/app-pgrestore.html) 
+  [PostgreSQL Dump options](https://www.postgresql.org/docs/17/app-pgdump.html).
+* `RESTORE_ARGS` Additional restore commands based on official [PostgreSQL restore](https://www.postgresql.org/docs/17/app-pgrestore.html) 
 * `STORAGE_BACKEND` The default backend is to store the backup files. It can either
   be `FILE` or `S3`(Example minio or amazon bucket) backends. 
 * `DB_TABLES` A boolean variable to specify if the user wants to dump the DB as individual tables. 
@@ -116,7 +116,7 @@ As a concrete example, with `DUMPPREFIX=PG` and if your postgis has DB name `gis
 The backup archive would be something like:
 
 ```
-/backups/2019/February/PG_gis.13-February-2019.dmp
+/backups/2019/February/PG_gis.17-February-2019.dmp
 ```
 
 If you specify `ARCHIVE_FILENAME` instead (default value is empty). The

docker-compose-s3.yml

@@ -1,6 +1,4 @@
 
-version: '2.1'
-
 volumes:
   db-data:
   minio_data:

docker-compose.build.yml

@@ -1,5 +1,4 @@
 # Used solely for docker-compose build
-version: '3.9'
 services:
   postgis-backup-prod:
     image: kartoza/pg-backup:$POSTGRES_MAJOR_VERSION-$POSTGIS_MAJOR_VERSION.${POSTGIS_MINOR_RELEASE}

docker-compose.yml

@@ -1,6 +1,4 @@
 
-version: '2.1'
-
 volumes:
   db-backups:
   db-data:

scenario_tests/restore/docker-compose.yml

@@ -1,14 +1,12 @@
 
-version: '2.1'
-
 volumes:
   pg-backup-data-dir:
   pg-data-dir:
 
 services:
 
   pg_backup:
-    image: kartoza/postgis:16-3.4
+    image: kartoza/postgis:17-3.5
     restart: 'always'
     volumes:
       - ./setup-db.sql:/docker-entrypoint-initdb.d/setup-db.sql

scenario_tests/s3/docker-compose.yml

@@ -1,6 +1,4 @@
 
-version: '2.1'
-
 volumes:
   pg-backup-data-dir:
   pg-data-dir:
@@ -9,7 +7,7 @@ volumes:
 services:
 
   db:
-    image: kartoza/postgis:16-3.4
+    image: kartoza/postgis:17-3.5
     restart: 'always'
     volumes:
       - ./setup-db.sql:/docker-entrypoint-initdb.d/setup-db.sql