From fc741a79cd72f3de28b738fd62f020e35c44b6a1 Mon Sep 17 00:00:00 2001
From: Fiona <fionadlapham@gmail.com>
Date: Wed, 22 Jul 2026 23:15:09 +0200
Subject: [PATCH 1/4] Update ruby version

---
 .github/workflows/main.yml | 2 +-
 Dockerfile                 | 2 +-
 Gemfile                    | 2 +-
 Gemfile.lock               | 9 +++++++--
 docker-compose.yml         | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8f81fc4..255fa01 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1.1"
+          ruby-version: "3.1.7"
 
       - name: Install PostgreSQL 11 client
         run: |
diff --git a/Dockerfile b/Dockerfile
index 2e64da2..b7bd1f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG DISTRO_NAME=bullseye
 
-FROM ruby:3.1.1-slim-$DISTRO_NAME
+FROM ruby:3.1.7-slim-$DISTRO_NAME
 
 ARG DISTRO_NAME
 
diff --git a/Gemfile b/Gemfile
index 7fa307c..6246aa4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.1.1"
+ruby "3.1.7"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "~> 7.0.4"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4404191..1543714 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,9 +211,11 @@ GEM
       net-protocol
     next_rails (1.2.1)
       colorize (>= 0.8.1)
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.13.9-aarch64-linux)
       racc (~> 1.4)
+    nokogiri (1.13.9-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.13.9-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.9-x86_64-linux)
@@ -392,6 +394,8 @@ GEM
       railties (>= 6.0.0)
     tailwindcss-rails (2.0.16-aarch64-linux)
       railties (>= 6.0.0)
+    tailwindcss-rails (2.0.16-arm64-darwin)
+      railties (>= 6.0.0)
     tailwindcss-rails (2.0.16-x86_64-darwin)
       railties (>= 6.0.0)
     tailwindcss-rails (2.0.16-x86_64-linux)
@@ -430,6 +434,7 @@ GEM
 
 PLATFORMS
   aarch64-linux
+  arm64-darwin-25
   x86_64-darwin-20
   x86_64-darwin-21
   x86_64-darwin-22
@@ -471,7 +476,7 @@ DEPENDENCIES
   webdrivers
 
 RUBY VERSION
-   ruby 3.1.1p18
+   ruby 3.1.7p261
 
 BUNDLED WITH
    2.3.23
diff --git a/docker-compose.yml b/docker-compose.yml
index 169af43..7b781c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     build:
       context: .
       args:
-        RUBY_VERSION: '3.1.1'
+        RUBY_VERSION: '3.1.7'
         PG_MAJOR: '14'
         NODE_MAJOR: '16'
         YARN_VERSION: '1.22.17'

From 840f0a95f98f92148fb6ea0dd8b3b4f8e6b10cf4 Mon Sep 17 00:00:00 2001
From: Fiona <fionadlapham@gmail.com>
Date: Thu, 23 Jul 2026 11:07:34 +0200
Subject: [PATCH 2/4] Update according to feedback, update variables

---
 .github/workflows/main.yml | 2 +-
 .ruby-version              | 2 +-
 Dockerfile                 | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 255fa01..303a655 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
         env:
           RAILS_ENV: test
         run: |
-          gem install bundler:2.2.29
+          gem install bundler:2.3.23
           bundle install --jobs 4 --retry 3
           yarn install
           rake db:setup
diff --git a/.ruby-version b/.ruby-version
index 2a49746..434c481 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.1.1
+ruby-3.1.7
diff --git a/Dockerfile b/Dockerfile
index b7bd1f2..3c5acfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 ARG DISTRO_NAME=bullseye
+ARG RUBY_VERSION=3.1.7
 
-FROM ruby:3.1.7-slim-$DISTRO_NAME
+FROM ruby:$RUBY_VERSION-slim-$DISTRO_NAME
 
 ARG DISTRO_NAME
 

From d60ad25d7b2151c86a7e20620e22f3874437531f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20V=C3=A1squez?= <juan@ombulabs.com>
Date: Thu, 23 Jul 2026 16:33:52 -0600
Subject: [PATCH 3/4] Remove unused ARG DISTRO_NAME re-declaration in
 Dockerfile

---
 Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3c5acfd..fe6b0c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,6 @@ ARG RUBY_VERSION=3.1.7
 
 FROM ruby:$RUBY_VERSION-slim-$DISTRO_NAME
 
-ARG DISTRO_NAME
-
 RUN apt-get update -qq \
   && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
     build-essential \

From a42cd288ec0873848d75fbbbc0679fdde19f5289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20V=C3=A1squez?= <juan@ombulabs.com>
Date: Thu, 23 Jul 2026 16:38:13 -0600
Subject: [PATCH 4/4] Remove duplicate dotenv-rails entry in Gemfile

---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 6246aa4..01a7ec2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,6 +84,5 @@ group :development, :test do
   gem "overcommit", "0.57.0"
   gem "next_rails"
 end
-gem "dotenv-rails"
 gem "dotenv_validator"
 gem "pagy"