From d800a1e3c75ab5c6efb69bb0b1d2fb4239a4741a Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Tue, 5 Nov 2024 10:25:10 +0000
Subject: [PATCH] chore(postgres): upgrade to v16.4 (#3438)

* chore(postgres): upgrade to v16.4

* Remove unnecessary change

* Remove obsolete makefile

* Revert changes which are now part of separate PR
---
 .circleci/config.yml                             | 4 ++--
 .circleci/deployment/Tiltfile.helm               | 3 ++-
 .github/workflows/preview-service-acceptance.yml | 2 +-
 docker/postgres/Dockerfile                       | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a01a41fb1..1d884919a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -439,7 +439,7 @@ jobs:
     docker:
       - image: cimg/node:18.19.0
       - image: cimg/redis:7.2.4
-      - image: cimg/postgres:17.0
+      - image: cimg/postgres:16.4@sha256:2e4f1a965bdd9ba77aa6a0a7b93968c07576ba2a8a7cf86d5eb7b31483db1378
         environment:
           POSTGRES_DB: speckle2_test
           POSTGRES_PASSWORD: speckle
@@ -624,7 +624,7 @@ jobs:
   test-preview-service:
     docker:
       - image: cimg/node:18.19.0
-      - image: cimg/postgres:14.11
+      - image: cimg/postgres:16.4@sha256:2e4f1a965bdd9ba77aa6a0a7b93968c07576ba2a8a7cf86d5eb7b31483db1378
         environment:
           POSTGRES_DB: preview_service_test
           POSTGRES_PASSWORD: preview_service_test
diff --git a/.circleci/deployment/Tiltfile.helm b/.circleci/deployment/Tiltfile.helm
index 4bd336a58..a2f634f2d 100644
--- a/.circleci/deployment/Tiltfile.helm
+++ b/.circleci/deployment/Tiltfile.helm
@@ -45,11 +45,12 @@ k8s_yaml('./manifests/priorityclass.yaml')
 k8s_yaml('./manifests/speckle-server.secret.yaml')
 
 # Install charts
+# Postgres 16.4 is packaged in chart 15.5.38
 helm_resource('postgresql',
             release_name='postgresql',
             namespace='postgres',
             chart='oci://registry-1.docker.io/bitnamicharts/postgresql',
-            flags=['--version=^12.0.0',
+            flags=['--version=^15.5.38',
                     '--values=./values/postgres.values.yaml',
                     '--kube-context=kind-speckle-server'],
             deps=['./values/postgres.values.yaml'],
diff --git a/.github/workflows/preview-service-acceptance.yml b/.github/workflows/preview-service-acceptance.yml
index e4c5dbf5d..5c707144e 100644
--- a/.github/workflows/preview-service-acceptance.yml
+++ b/.github/workflows/preview-service-acceptance.yml
@@ -69,7 +69,7 @@ jobs:
     services:
       postgres:
         # Docker Hub image
-        image: postgres:14
+        image: postgres:16.4-bookworm@sha256:91f464e7ba0ad91a106c94cff079fb4384139291b8c0502fd36989cf2c788bbb
         env:
           POSTGRES_DB: preview_service_test
           POSTGRES_PASSWORD: preview_service_test
diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
index 9da6a4538..53e2acb8b 100644
--- a/docker/postgres/Dockerfile
+++ b/docker/postgres/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:14.5-alpine as builder
+FROM postgres:16.4-alpine3.20@sha256:d898b0b78a2627cb4ee63464a14efc9d296884f1b28c841b0ab7d7c42f1fffdf AS builder
 
 RUN apk add --no-cache 'git=~2.36' \
     'build-base=~0.5' \
@@ -14,7 +14,7 @@ RUN git checkout 36598ab \
   && make \
   && make install
 
-FROM postgres:14.5-alpine
+FROM postgres:16.4-alpine3.20@sha256:d898b0b78a2627cb4ee63464a14efc9d296884f1b28c841b0ab7d7c42f1fffdf AS runner
 
 COPY --from=builder /aiven-extras/aiven_extras.control /usr/local/share/postgresql/extension/aiven_extras.control
 COPY --from=builder /aiven-extras/sql/aiven_extras.sql /usr/local/share/postgresql/extension/aiven_extras--1.1.9.sql