From 2a2bed3ba32ffad6b73d13a983cbe19b83874a0d Mon Sep 17 00:00:00 2001
From: Marc Sardon <marc@bichito.software>
Date: Thu, 20 Jun 2024 16:49:52 +0100
Subject: [PATCH] Upgrade Ruby to v3.3.3

Patch version with some minor upgrades and Bundler/Rubygems version
upgrades.
---
 .devcontainer/Dockerfile | 2 +-
 .ruby-version            | 2 +-
 .tool-versions           | 2 +-
 Dockerfile               | 6 +++---
 Gemfile                  | 2 +-
 Gemfile.lock             | 3 +--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9deda873c48..3c4e683a48f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.3.2
+ARG RUBY_VERSION=3.3.3
 FROM ruby:${RUBY_VERSION}
 
 ARG USERNAME=teaching-vacancies
diff --git a/.ruby-version b/.ruby-version
index 47725433179..619b5376684 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.2
+3.3.3
diff --git a/.tool-versions b/.tool-versions
index 4e26a4765fa..8d1dbe2bbe0 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
-ruby 3.3.2
+ruby 3.3.3
 nodejs 18.4.0
 yarn 1.22.17
 terraform 1.5.1
diff --git a/Dockerfile b/Dockerfile
index 57f161aa3b0..131b8fbae44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
  # Some packages are defined here with a hardcoded version to resolve vulnerabilities in the packages coming with
  # Alpine v3.19.
- # TODO: Regularly check in the alpine ruby "3.3.2-alpine3.19" images for its latest upgraded packages so we can remove
+ # TODO: Regularly check in the alpine ruby "3.3.3-alpine3.19" images for its latest upgraded packages so we can remove
  # the hardcoded versions below when they have been updated in the alpine ruby image.
 ARG PROD_PACKAGES="imagemagick libpng libjpeg libxml2 libxslt libpq tzdata shared-mime-info postgresql15 busybox=1.36.1-r19"
 
-FROM ruby:3.3.2-alpine3.19 AS builder
+FROM ruby:3.3.3-alpine3.19 AS builder
 
 WORKDIR /app
 
@@ -48,7 +48,7 @@ RUN rm -rf node_modules log tmp yarn.lock && \
 
 
 # this stage reduces the image size.
-FROM ruby:3.3.2-alpine3.19 AS production
+FROM ruby:3.3.3-alpine3.19 AS production
 
 WORKDIR /app
 
diff --git a/Gemfile b/Gemfile
index 37246853859..68c46dcc8c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "3.3.2"
+ruby "3.3.3"
 
 RAILS_VERSION = "~> 7.1.2".freeze
 gem "actionmailer", RAILS_VERSION
diff --git a/Gemfile.lock b/Gemfile.lock
index 7231b111158..35d1d5b2b15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -340,7 +340,6 @@ GEM
       date
       net-protocol
     net-pop (0.1.2)
-      net-protocol
     net-protocol (0.2.2)
       timeout
     net-sftp (4.0.0)
@@ -818,7 +817,7 @@ DEPENDENCIES
   zendesk_api
 
 RUBY VERSION
-   ruby 3.3.2p78
+   ruby 3.3.3p89
 
 BUNDLED WITH
    2.3.5