From 96a40b2c4e051f604c3be1133dc9cca9851d2b28 Mon Sep 17 00:00:00 2001
From: danielxnj <daniel@posthog.com>
Date: Wed, 23 Aug 2023 10:17:14 -0400
Subject: [PATCH 1/3] Update base postgres to version 15

---
 docker-compose.base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index d107d351044be..c5a37142a1945 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -4,7 +4,7 @@
 
 services:
     db:
-        image: ${DOCKER_REGISTRY_PREFIX:-}postgres:12-alpine
+        image: ${DOCKER_REGISTRY_PREFIX:-}postgres:15-alpine
         restart: on-failure
         environment:
             POSTGRES_USER: posthog

From 1bf2dc5b20e7c20f4761b35f7e842cc672e85332 Mon Sep 17 00:00:00 2001
From: danielxnj <daniel@posthog.com>
Date: Fri, 25 Aug 2023 08:48:24 -0400
Subject: [PATCH 2/3] Pin pg12 for hobby installations

---
 docker-compose.hobby.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/docker-compose.hobby.yml b/docker-compose.hobby.yml
index cc61b627e0a0c..e355495f8271a 100644
--- a/docker-compose.hobby.yml
+++ b/docker-compose.hobby.yml
@@ -10,11 +10,20 @@
 
 services:
     db:
-        extends:
-            file: docker-compose.base.yml
-            service: db
+        #Pin to postgres 12 until we have a process for pg_upgrade to postgres 15 for exsisting installations
+        image: ${DOCKER_REGISTRY_PREFIX:-}postgres:12-alpine
+        restart: on-failure
+        environment:
+            POSTGRES_USER: posthog
+            POSTGRES_DB: posthog
+            POSTGRES_PASSWORD: posthog
+        healthcheck:
+            test: ['CMD-SHELL', 'pg_isready -U posthog']
+            interval: 5s
+            timeout: 5s
         volumes:
             - postgres-data:/var/lib/postgresql/data
+
     redis:
         extends:
             file: docker-compose.base.yml

From 3263b5e1b9c907a2d50dd1ad8ba9172441e90f3a Mon Sep 17 00:00:00 2001
From: danielxnj <115043334+danielxnj@users.noreply.github.com>
Date: Wed, 13 Sep 2023 09:50:33 -0400
Subject: [PATCH 3/3] Update docker-compose.hobby.yml

Co-authored-by: Xavier Vello <xavier.vello@gmail.com>
---
 docker-compose.hobby.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/docker-compose.hobby.yml b/docker-compose.hobby.yml
index e355495f8271a..bf63efa21e0b2 100644
--- a/docker-compose.hobby.yml
+++ b/docker-compose.hobby.yml
@@ -10,17 +10,11 @@
 
 services:
     db:
-        #Pin to postgres 12 until we have a process for pg_upgrade to postgres 15 for exsisting installations
+        extends:
+            file: docker-compose.base.yml
+            service: db
+        # Pin to postgres 12 until we have a process for pg_upgrade to postgres 15 for exsisting installations
         image: ${DOCKER_REGISTRY_PREFIX:-}postgres:12-alpine
-        restart: on-failure
-        environment:
-            POSTGRES_USER: posthog
-            POSTGRES_DB: posthog
-            POSTGRES_PASSWORD: posthog
-        healthcheck:
-            test: ['CMD-SHELL', 'pg_isready -U posthog']
-            interval: 5s
-            timeout: 5s
         volumes:
             - postgres-data:/var/lib/postgresql/data