Upgrade to ruby 3.3.6

DFE-Digital · Nov 27, 2024 · 7d5f313 · 7d5f313
1 parent abf2f4e
commit 7d5f313
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 FROM ruby:${RUBY_VERSION}
 
 ARG USERNAME=teaching-vacancies

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/.tool-versions b/.tool-versions
@@ -1,4 +1,4 @@
-ruby 3.3.5
+ruby 3.3.6
 nodejs 18.4.0
 yarn 1.22.17
 terraform 1.5.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,7 @@
  # 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.5-alpine3.19" images for its latest upgraded packages so we can remove
+ # TODO: Regularly check in the alpine ruby "3.3.6-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 openssl=3.1.7-r1 expat=2.6.4-r0"
-
 FROM ruby:3.3.6-alpine3.19 AS builder
 
 WORKDIR /app

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "3.3.5"
+ruby "3.3.6"
 
 RAILS_VERSION = "~> 7.1.2".freeze
 gem "actionmailer", RAILS_VERSION

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -221,6 +221,7 @@ GEM
       net-http
     fastimage (2.3.1)
     ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
@@ -369,6 +370,8 @@ GEM
     nio4r (2.7.3)
     nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     noticed (2.4.3)
@@ -412,7 +415,7 @@ GEM
     parallel (1.26.3)
     parallel_tests (4.7.2)
       parallel
-    parser (3.3.5.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -757,6 +760,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -876,7 +880,7 @@ DEPENDENCIES
   zendesk_api
 
 RUBY VERSION
-   ruby 3.3.5p100
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.3.5