From b6f7723b189b72ed0117bc24bf495e38281c069e Mon Sep 17 00:00:00 2001 From: Alan Hodgson Date: Wed, 11 Mar 2026 16:00:55 -0700 Subject: [PATCH 1/2] Upgrade to Ruby 3.4.9 --- CHANGELOG.md | 1 + README.md | 16 ++++++++-------- image/{ruby-3.4.8.sh => ruby-3.4.9.sh} | 0 3 files changed, 9 insertions(+), 8 deletions(-) rename image/{ruby-3.4.8.sh => ruby-3.4.9.sh} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07e49fd..87473d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Added a Ruby 4.0 image (Ruby 4.0.1) * Upgraded to Ruby 3.2.10 (from 3.2.9) * Upgraded to Phusion Passenger 6.1.2 (was 6.1.1) + * Upgraded to Ruby 3.4.9 (from 3.4.8) ## 3.1.5 (release date: 2025-12-23) * Upgraded to Phusion Passenger 6.1.1 (was 6.1.0) diff --git a/README.md b/README.md index 19d277d..90ea03d 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.2.10, 3.3.10, 3.4.8, 4.0.1 and JRuby 10.0.2.0 and 9.4.14.0. + * Ruby 3.2.10, 3.3.10, 3.4.9, 4.0.1 and JRuby 10.0.2.0 and 9.4.14.0. * RVM is used to manage Ruby versions. [Why RVM?](#why_rvm) * 4.0.1 is configured as the default. * JRuby uses OpenJDK 17 (9.4) or 21 (10.0). @@ -455,8 +455,8 @@ The default Ruby (what the `/usr/bin/ruby` command executes) is the latest Ruby RUN bash -lc 'rvm --default use ruby-3.2.10' # Ruby 3.3.10 RUN bash -lc 'rvm --default use ruby-3.3.10' -# Ruby 3.4.8 -RUN bash -lc 'rvm --default use ruby-3.4.8' +# Ruby 3.4.9 +RUN bash -lc 'rvm --default use ruby-3.4.9' # Ruby 4.0.1 RUN bash -lc 'rvm --default use ruby-4.0.1' # JRuby 9.4.9.0 @@ -477,16 +477,16 @@ $ rvm-exec 3.3.10 ruby -v Using /usr/local/rvm/gems/ruby-3.3.10 ruby 3.3.10 (2025-10-23 revision 343ea05002) [x86_64-linux] -$ rvm-exec 3.4.8 ruby -v -Using /usr/local/rvm/gems/ruby-3.4.8 -ruby 3.4.8 (2025-12-17 revision 995b59f666) +PRISM [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] ``` More examples, but with Bundler instead: ```bash -# This runs 'bundle install' using Ruby 3.4.8 -rvm-exec 3.4.8 bundle install +# This runs 'bundle install' using Ruby 3.4.9 +rvm-exec 3.4.9 bundle install ``` diff --git a/image/ruby-3.4.8.sh b/image/ruby-3.4.9.sh similarity index 100% rename from image/ruby-3.4.8.sh rename to image/ruby-3.4.9.sh From 4e5b681e75daade862edcee31182f2fbca509973 Mon Sep 17 00:00:00 2001 From: Alan Hodgson Date: Wed, 11 Mar 2026 16:01:28 -0700 Subject: [PATCH 2/2] Allow REGISTRY to be configurable to fix local builds --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f3293b..2379cde 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ SHELL := /bin/bash ifeq ($(GITHUB_ACTIONS),true) REGISTRY = ghcr.io else -REGISTRY = docker.io +REGISTRY ?= docker.io endif NAME ?= $(REGISTRY)/phusion/passenger