From 88837906fd985c61f72284c271af97b98f1df4bf Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Sun, 26 May 2024 06:23:33 +0200
Subject: [PATCH 1/2] Updgrade Postgres to 14, nodejs to 18

---
 .tool-versions     | 4 ++--
 Dockerfile         | 6 +++---
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 66831fbc6..c505065db 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 ruby 3.0.0
-nodejs 12.22.12
-postgres 12.2
+nodejs 18.9.1
+postgres 14.3
diff --git a/Dockerfile b/Dockerfile
index ddf78368a..47b9a5d0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.0.2-alpine3.12
+FROM ruby:3.0.5-alpine3.16
 
 ARG git_commit_sha
 ARG git_commit_date
@@ -10,8 +10,8 @@ RUN apk --update add \
     git \
     nodejs \
     npm \
-    postgresql-dev=~12 \
-    postgresql-client=~12 \
+    postgresql-dev \
+    postgresql-client \
     tzdata \
     libxslt-dev \
     libxml2-dev \
diff --git a/docker-compose.yml b/docker-compose.yml
index 9917d4881..ecdb84932 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
     depends_on: [ db, signal ]
 
   db:
-    image: postgres:12.2-alpine
+    image: postgres:14.3-alpine3.16
     volumes:
       - postgres_data:/var/lib/postgresql/data
 

From f73d1b5926a4d74eea7094a7c5fe295e35172ebe Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Sun, 26 May 2024 07:13:54 +0200
Subject: [PATCH 2/2] Remove code creep, use nodejs-current

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 47b9a5d0f..4667ee5dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN apk --update add \
     build-base \
     bash \
     git \
-    nodejs \
+    nodejs-current \
     npm \
     postgresql-dev \
     postgresql-client \