From e7f5aa47213f7012a0104bbfb1f8fd478ef01212 Mon Sep 17 00:00:00 2001 From: Admire Nyakudya Date: Sun, 8 Oct 2023 17:18:52 +0200 Subject: [PATCH 1/2] upgrade to v16 --- .github/workflows/deploy-image.yaml | 6 +++--- Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index 894d7cb6..d7791ae9 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -64,7 +64,7 @@ jobs: GENERATE_ALL_LOCALE=1 POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }} POSTGIS_MAJOR_VERSION=${{ matrix.postgisMajorVersion }} - POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorVersion }} + POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorRelease }} cache-from: | type=gha,scope=test type=gha,scope=prod @@ -83,7 +83,7 @@ jobs: tags: | ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }} ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }} - ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }} + ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}-${{ matrix.postgisMinorRelease }} ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}--v${{ steps.current_date.outputs.formatted }} build-args: | DISTRO=${{ matrix.imageVersion.imageDistro }} @@ -92,7 +92,7 @@ jobs: GENERATE_ALL_LOCALE=1 POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }} POSTGIS_MAJOR_VERSION=${{ matrix.postgisMajorVersion }} - POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorVersion }} + POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorRelease }} cache-from: | type=gha,scope=test type=gha,scope=prod diff --git a/Dockerfile b/Dockerfile index 8952ad59..f90e1321 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,7 +72,7 @@ FROM postgis-base AS postgis-prod # Reset ARG for version ARG IMAGE_VERSION -ARG POSTGRES_MAJOR_VERSION=15 +ARG POSTGRES_MAJOR_VERSION=16 ARG POSTGIS_MAJOR_VERSION=3 ARG POSTGIS_MINOR_RELEASE=4 # https://packagecloud.io/timescale/timescaledb From 40d3f0a2629074f0f3a48cd135520c82c169ef43 Mon Sep 17 00:00:00 2001 From: Admire Nyakudya Date: Sun, 8 Oct 2023 17:21:07 +0200 Subject: [PATCH 2/2] fix tagging --- .github/workflows/deploy-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index d7791ae9..d5314c5a 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -83,7 +83,7 @@ jobs: tags: | ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }} ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }} - ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}-${{ matrix.postgisMinorRelease }} + ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }} ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}--v${{ steps.current_date.outputs.formatted }} build-args: | DISTRO=${{ matrix.imageVersion.imageDistro }}