From dc5b70f87767d5d8c2c5292880f0bfb6daeece1d Mon Sep 17 00:00:00 2001
From: admire <admire@kartoza.com>
Date: Fri, 1 Oct 2021 16:37:12 +0200
Subject: [PATCH 1/2] upgrade to PostgreSQL version 14

---
 .example.env                                  | 2 +-
 .github/workflows/build-latest.yaml           | 4 ++--
 .github/workflows/deploy-image.yaml           | 2 +-
 Dockerfile                                    | 2 +-
 docker-compose.yml                            | 4 ++--
 sample/logical_replication/docker-compose.yml | 4 ++--
 sample/replication/docker-compose.yml         | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.example.env b/.example.env
index 7bc4714..6d0bc24 100644
--- a/.example.env
+++ b/.example.env
@@ -13,6 +13,6 @@ LANG=en_US.UTF-8
 # locale filter to include in the locale generator
 LANGS="en_US.UTF-8,id_ID.UTF-8"
 
-POSTGRES_MAJOR_VERSION=13
+POSTGRES_MAJOR_VERSION=14
 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_RELEASE=1
diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml
index 2eb89b0..96b39a1 100644
--- a/.github/workflows/build-latest.yaml
+++ b/.github/workflows/build-latest.yaml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         postgresMajorVersion:
-          - 13
+          - 14
         postgisMajorVersion:
           - 3
         postgisMinorRelease:
@@ -85,7 +85,7 @@ jobs:
     strategy:
       matrix:
         postgresMajorVersion:
-          - 13
+          - 14
         postgisMajorVersion:
           - 3
         postgisMinorRelease:
diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml
index 3444f80..5fa3b11 100644
--- a/.github/workflows/deploy-image.yaml
+++ b/.github/workflows/deploy-image.yaml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         postgresMajorVersion:
-          - 13
+          - 14
         postgisMajorVersion:
           - 3
         postgisMinorRelease:
diff --git a/Dockerfile b/Dockerfile
index 38a576b..66f1628 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,7 +65,7 @@ FROM postgis-base AS postgis-prod
 
 # Reset ARG for version
 ARG IMAGE_VERSION
-ARG POSTGRES_MAJOR_VERSION=13
+ARG POSTGRES_MAJOR_VERSION=14
 ARG POSTGIS_MAJOR_VERSION=3
 ARG POSTGIS_MINOR_RELEASE=1
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 37fd44f..fb7a9e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
 services:
 
   db:
-    image: kartoza/postgis:13-3.1
+    image: kartoza/postgis:14-3.1
     volumes:
       - postgis-data:/var/lib/postgresql
       - dbbackups:/backups
@@ -26,7 +26,7 @@ services:
       test: "exit 0"
 
   dbbackups:
-    image: kartoza/pg-backup:13.0
+    image: kartoza/pg-backup:14.0
     hostname: pg-backups
     volumes:
       - dbbackups:/backups
diff --git a/sample/logical_replication/docker-compose.yml b/sample/logical_replication/docker-compose.yml
index bdc4460..0c3f303 100644
--- a/sample/logical_replication/docker-compose.yml
+++ b/sample/logical_replication/docker-compose.yml
@@ -8,7 +8,7 @@ volumes:
 
 services:
   pg-publisher:
-    image: kartoza/postgis:13.0
+    image: kartoza/postgis:14-3.1
     restart: 'always'
     volumes:
       - pg-publisher-data-dir:/var/lib/postgresql
@@ -25,7 +25,7 @@ services:
       test: "exit 0"
 
   pg-subscriber:
-    image: kartoza/postgis:13.0
+    image: kartoza/postgis:14-3.1
     restart: 'always'
     volumes:
       - pg-subscriber-data-dir:/var/lib/postgresql
diff --git a/sample/replication/docker-compose.yml b/sample/replication/docker-compose.yml
index 516076c..be3544b 100644
--- a/sample/replication/docker-compose.yml
+++ b/sample/replication/docker-compose.yml
@@ -8,7 +8,7 @@ volumes:
 
 services:
   pg-master:
-    image: 'kartoza/postgis:13.0'
+    image: kartoza/postgis:14-3.1
     restart: 'always'
     # You can optionally mount to volume, to play with the persistence and
     # observe how the slave will behave after restarts.
@@ -35,7 +35,7 @@ services:
       test: "exit 0"
 
   pg-slave:
-    image: 'kartoza/postgis:13.0'
+    image: kartoza/postgis:14-3.1
     restart: 'always'
     # You can optionally mount to volume, but we're not able to scale it
     # in that case.

From 2b27aa0a917ca4cb6c9cf35e1729eca89fcd92f4 Mon Sep 17 00:00:00 2001
From: admire <admire@kartoza.com>
Date: Fri, 1 Oct 2021 17:52:52 +0200
Subject: [PATCH 2/2] fix pg_hba_config based on new changes

---
 scripts/setup-pg_hba.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setup-pg_hba.sh b/scripts/setup-pg_hba.sh
index aaa146b..d06a3f8 100644
--- a/scripts/setup-pg_hba.sh
+++ b/scripts/setup-pg_hba.sh
@@ -25,12 +25,12 @@ else
   if  [[ "${SSL_KEY_FILE}" != '/etc/ssl/private/ssl-cert-snakeoil.key' ]]; then
     PG_CONF_HOST='hostssl'
     CERT_AUTH='cert'
-    CLIENT_VERIFY=
+    CLIENT_VERIFY='clientcert=verify-full'
   else
     # Used when using the default ssl certs
     PG_CONF_HOST='hostssl'
     CERT_AUTH=${PASSWORD_AUTHENTICATION}
-    CLIENT_VERIFY='clientcert=0'
+    CLIENT_VERIFY=
   fi
 
 fi