From d1f615c5ddcc06f004b2f5ddb2f987ba7ec34ed5 Mon Sep 17 00:00:00 2001 From: Alan Hodgson Date: Mon, 13 Jul 2026 08:33:29 -0700 Subject: [PATCH 1/2] Upgrade to Ruby 3.4.10 [skip ci] --- CHANGELOG.md | 2 +- README.md | 16 ++++++++-------- image/{ruby-3.4.9.sh => ruby-3.4.10.sh} | 0 3 files changed, 9 insertions(+), 9 deletions(-) rename image/{ruby-3.4.9.sh => ruby-3.4.10.sh} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97b2cfa..5295447 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## 3.1.11 (not yet released) - * + * Upgraded to Ruby 3.4.10 (from 3.4.9) ## 3.1.10 (release date: 2026-06-26) * Upgraded to Phusion Passenger 6.1.6 (was 6.1.5) diff --git a/README.md b/README.md index 3471566..76fb94f 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock Language support: - * Ruby 3.3.11, 3.4.9, 4.0.5 and JRuby 10.0.2.0 and 9.4.14.0. + * Ruby 3.3.11, 3.4.10, 4.0.5 and JRuby 10.0.2.0 and 9.4.14.0. * RVM is used to manage Ruby versions. [Why RVM?](#why_rvm) * 4.0.5 is configured as the default. * JRuby uses OpenJDK 17 (9.4) or 21 (10.0). @@ -448,8 +448,8 @@ The default Ruby (what the `/usr/bin/ruby` command executes) is the latest Ruby ```dockerfile # Ruby 3.3.11 RUN bash -lc 'rvm --default use ruby-3.3.11' -# Ruby 3.4.9 -RUN bash -lc 'rvm --default use ruby-3.4.9' +# Ruby 3.4.10 +RUN bash -lc 'rvm --default use ruby-3.4.10' # Ruby 4.0.5 RUN bash -lc 'rvm --default use ruby-4.0.5' # JRuby 9.4.9.0 @@ -470,9 +470,9 @@ $ rvm-exec 3.3.11 ruby -v Using /usr/local/rvm/gems/ruby-3.3.11 ruby 3.3.11 (2026-03-26 revision 1f2d15125a) [x86_64-linux] -$ rvm-exec 3.4.9 ruby -v -Using /usr/local/rvm/gems/ruby-3.4.9 -ruby 3.4.9 (2026-03-11 revision 76cca827ab) +PRISM [x86_64-linux] +$ rvm-exec 3.4.10 ruby -v +Using /usr/local/rvm/gems/ruby-3.4.10 +ruby 3.4.10 (2026-06-30 revision 2b0b7728dc) +PRISM [x86_64-linux] $ rvm-exec 4.0.5 ruby -v Using /usr/local/rvm/gems/ruby-4.0.5 @@ -482,8 +482,8 @@ ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +PRISM [x86_64-linux] More examples, but with Bundler instead: ```bash -# This runs 'bundle install' using Ruby 3.4.9 -rvm-exec 3.4.9 bundle install +# This runs 'bundle install' using Ruby 3.4.10 +rvm-exec 3.4.10 bundle install ``` diff --git a/image/ruby-3.4.9.sh b/image/ruby-3.4.10.sh similarity index 100% rename from image/ruby-3.4.9.sh rename to image/ruby-3.4.10.sh From 212b82cd4db12d9d6e8a289aa34e7a0b05ef2ddf Mon Sep 17 00:00:00 2001 From: Alan Hodgson Date: Tue, 14 Jul 2026 14:18:00 -0700 Subject: [PATCH 2/2] Upgrade to Ruby 4.0.6 [skip ci] --- CHANGELOG.md | 1 + README.md | 14 +++++++------- image/nginx-passenger.sh | 2 +- image/{ruby-4.0.5.sh => ruby-4.0.6.sh} | 0 4 files changed, 9 insertions(+), 8 deletions(-) rename image/{ruby-4.0.5.sh => ruby-4.0.6.sh} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5295447..84395c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 3.1.11 (not yet released) * Upgraded to Ruby 3.4.10 (from 3.4.9) + * Upgraded to Ruby 4.0.6 (from 4.0.5) ## 3.1.10 (release date: 2026-06-26) * Upgraded to Phusion Passenger 6.1.6 (was 6.1.5) diff --git a/README.md b/README.md index 76fb94f..fe1de2f 100644 --- a/README.md +++ b/README.md @@ -94,9 +94,9 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock Language support: - * Ruby 3.3.11, 3.4.10, 4.0.5 and JRuby 10.0.2.0 and 9.4.14.0. + * Ruby 3.3.11, 3.4.10, 4.0.6 and JRuby 10.0.2.0 and 9.4.14.0. * RVM is used to manage Ruby versions. [Why RVM?](#why_rvm) - * 4.0.5 is configured as the default. + * 4.0.6 is configured as the default. * JRuby uses OpenJDK 17 (9.4) or 21 (10.0). * Python 3.12, or any version provided by the Deadsnakes PPA (currently 3.10, 3.11, 3.12, 3.13, 3,14; see https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa). * Node.js 24 by default, or any version provided by Nodesource (currently 20, 22, 24; see https://github.com/nodesource/distributions). @@ -450,8 +450,8 @@ The default Ruby (what the `/usr/bin/ruby` command executes) is the latest Ruby RUN bash -lc 'rvm --default use ruby-3.3.11' # Ruby 3.4.10 RUN bash -lc 'rvm --default use ruby-3.4.10' -# Ruby 4.0.5 -RUN bash -lc 'rvm --default use ruby-4.0.5' +# Ruby 4.0.6 +RUN bash -lc 'rvm --default use ruby-4.0.6' # JRuby 9.4.9.0 RUN bash -lc 'rvm --default use jruby-9.4.9.0' # JRuby 10.0.0.0 @@ -474,9 +474,9 @@ $ rvm-exec 3.4.10 ruby -v Using /usr/local/rvm/gems/ruby-3.4.10 ruby 3.4.10 (2026-06-30 revision 2b0b7728dc) +PRISM [x86_64-linux] -$ rvm-exec 4.0.5 ruby -v -Using /usr/local/rvm/gems/ruby-4.0.5 -ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +PRISM [x86_64-linux] +$ rvm-exec 4.0.6 ruby -v +Using /usr/local/rvm/gems/ruby-4.0.6 +ruby 4.0.6 (2026-07-14 revision 03b6d3f889) +PRISM [x86_64-linux] ``` More examples, but with Bundler instead: diff --git a/image/nginx-passenger.sh b/image/nginx-passenger.sh index 9395a0f..df4d584 100755 --- a/image/nginx-passenger.sh +++ b/image/nginx-passenger.sh @@ -9,7 +9,7 @@ header "Installing Phusion Passenger..." ## Install it through RVM, not APT, so that the -customizable variant cannot end up ## having Ruby installed from both APT and RVM. if [[ ! -e /usr/bin/ruby ]]; then - RVM_ID="ruby-4.0.5" + RVM_ID="ruby-4.0.6" run mkdir -p "/build_cache/${ARCH}" if [[ -e "/build_cache/${ARCH}/${RVM_ID}.tar.bz2" ]]; then diff --git a/image/ruby-4.0.5.sh b/image/ruby-4.0.6.sh similarity index 100% rename from image/ruby-4.0.5.sh rename to image/ruby-4.0.6.sh