From bd6807078c7eba1adeee88e2590ac7f62d5a7aa1 Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanh@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:25:26 +0100
Subject: [PATCH] Correct Postgres version in dev and CI

LMS's staging and production environments use Postgres 15.5 not 15.6.
---
 .cookiecutter/cookiecutter.json                 | 2 +-
 .cookiecutter/includes/.github/workflows/ci.yml | 2 +-
 .github/workflows/ci.yml                        | 6 +++---
 docker-compose.yml                              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.cookiecutter/cookiecutter.json b/.cookiecutter/cookiecutter.json
index 649ef47fbc..95251a58ec 100644
--- a/.cookiecutter/cookiecutter.json
+++ b/.cookiecutter/cookiecutter.json
@@ -33,7 +33,7 @@
     "postgres": "yes",
     "docker": "yes",
     "__postgres_port": "5433",
-    "__postgres_version": "15.6-alpine",
+    "__postgres_version": "15.5-alpine",
     "__docker_namespace": "hypothesis",
     "__docker_network": "lms_default",
     "__github_url": "https://github.com/hypothesis/lms",
diff --git a/.cookiecutter/includes/.github/workflows/ci.yml b/.cookiecutter/includes/.github/workflows/ci.yml
index f1b85b3c08..6f50470439 100644
--- a/.cookiecutter/includes/.github/workflows/ci.yml
+++ b/.cookiecutter/includes/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ BDD_Tests:
   runs-on: ubuntu-latest
   services:
     postgres:
-      image: postgres:15.6-alpine
+      image: postgres:15.5-alpine
       ports:
       - 5433:5432
       env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5785d7e71..8aff282ad3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest-32-cores
     services:
       postgres:
-        image: postgres:15.6-alpine
+        image: postgres:15.5-alpine
         ports:
         - 5433:5432
         env:
@@ -143,7 +143,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:15.6-alpine
+        image: postgres:15.5-alpine
         ports:
         - 5433:5432
         env:
@@ -179,7 +179,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgres:15.6-alpine
+        image: postgres:15.5-alpine
         ports:
         - 5433:5432
         env:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b8d093252..250afad55e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: postgres:15.6-alpine
+    image: postgres:15.5-alpine
     ports:
       - "127.0.0.1:5433:5432"
     healthcheck: