From 915ba8ec23e57320467c3c0e230b96b6d86c7a9b Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Wed, 15 May 2024 20:44:36 +0100
Subject: [PATCH] Ruby update

---
 .ruby-version     | 2 +-
 Dockerfile        | 9 ++++-----
 Gemfile           | 2 +-
 Gemfile.lock      | 2 +-
 config/deploy.yml | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index be94e6f..bea438e 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.1
diff --git a/Dockerfile b/Dockerfile
index 96161ae..fa2e54d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.2.2
+ARG RUBY_VERSION=3.3.1
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
 
 # Rails app lives here
@@ -17,15 +17,14 @@ FROM base as build
 RUN apt-get update -qq && \
     apt-get install --no-install-recommends -y build-essential curl git libpq-dev libvips pkg-config
 
+# Copy application code
+COPY . .
+
 # Install application gems
-COPY Gemfile Gemfile.lock ./
 RUN bundle install && \
     rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
     bundle exec bootsnap precompile --gemfile
 
-# Copy application code
-COPY . .
-
 # Precompile bootsnap code for faster boot times
 RUN bundle exec bootsnap precompile app/ lib/
 
diff --git a/Gemfile b/Gemfile
index 7feff71..a7fec95 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.2.2"
+ruby file: "./.ruby-version"
 
 gem "rails", "~> 7.1"
 gem "sprockets-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index c86ce58..e316ab6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -288,7 +288,7 @@ DEPENDENCIES
   web-console
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.3.1p55
 
 BUNDLED WITH
    2.4.19
diff --git a/config/deploy.yml b/config/deploy.yml
index d6c9309..d4ce87d 100644
--- a/config/deploy.yml
+++ b/config/deploy.yml
@@ -41,7 +41,7 @@ ssh:
 builder:
   args:
     APPLICATION_HOST: tsvallender.co.uk
-    RUBY_VERSION: 3.2.2
+    RUBY_VERSION: 3.3.1
   remote:
     arch: arm64
     host: ssh://kamal@tsvallender.co.uk