From 46e0006848de1bf78c1441838a0ae1e0823c0326 Mon Sep 17 00:00:00 2001 From: Alan Hodgson Date: Thu, 30 May 2024 07:46:10 -0700 Subject: [PATCH] Upgrade to Ruby 3.3.2 --- CHANGELOG.md | 1 + README.md | 16 ++++++++++------ image/nginx-passenger.sh | 2 +- image/{ruby-3.3.1.sh => ruby-3.3.2.sh} | 0 4 files changed, 12 insertions(+), 7 deletions(-) rename image/{ruby-3.3.1.sh => ruby-3.3.2.sh} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67a982f6..578ceec1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 3.0.6 (release date: TBD) * Upgraded to Ruby 3.1.6 + * Upgraded to Ruby 3.3.2 ## 3.0.5 (release date: 2024-05-18) * Removed Ruby 3.0 (EOL: 2024-04-23) diff --git a/README.md b/README.md index 81778aeb..92060529 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.1.6, 3.2.4, 3.3.1 and JRuby 9.3.14.0 and 9.4.6.0. + * Ruby 3.1.6, 3.2.4, 3.3.2 and JRuby 9.3.14.0 and 9.4.6.0. * RVM is used to manage Ruby versions. [Why RVM?](#why_rvm) - * 3.3.1 is configured as the default. + * 3.3.2 is configured as the default. * JRuby is installed from source, but we register an APT entry for it. * JRuby uses OpenJDK 17. * Python 2.7 or 3.10, or any version provided by the Deadsnakes PPA (currently 3.7, 3.8, 3.9, 3.11, and 3.12; see https://launchpad.net/~deadsnakes/+archive/ubuntu/ppa). @@ -451,8 +451,8 @@ The default Ruby (what the `/usr/bin/ruby` command executes) is the latest Ruby RUN bash -lc 'rvm --default use ruby-3.1.6' # Ruby 3.2.4 RUN bash -lc 'rvm --default use ruby-3.2.4' -# Ruby 3.3.1 -RUN bash -lc 'rvm --default use ruby-3.3.1' +# Ruby 3.3.2 +RUN bash -lc 'rvm --default use ruby-3.3.2' # JRuby 9.3.14.0 RUN bash -lc 'rvm --default use jruby-9.3.14.0' # JRuby 9.4.6.0 @@ -470,13 +470,17 @@ You can run any command with a specific Ruby version by prefixing it with `rvm-e $ rvm-exec 3.1.6 ruby -v Using /usr/local/rvm/gems/ruby-3.1.6 ruby 3.1.6p260 (2024-05-29 revision a777087be6) [x86_64-linux] + +$ rvm-exec 3.3.2 ruby -v +Using /usr/local/rvm/gems/ruby-3.3.2 +ruby 3.3.2 (2024-05-30 revision e5a195edf6) [x86_64-linux] ``` More examples, but with Bundler instead: ```bash -# This runs 'bundle install' using Ruby 3.1.6 -rvm-exec 3.1.6 bundle install +# This runs 'bundle install' using Ruby 3.3.2 +rvm-exec 3.3.2 bundle install ``` diff --git a/image/nginx-passenger.sh b/image/nginx-passenger.sh index cb16d1ed..95c777a3 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-3.3.1" + RVM_ID="ruby-3.3.2" run mkdir -p "/build_cache/${ARCH}" if [[ -e "/build_cache/${ARCH}/${RVM_ID}.tar.bz2" ]]; then diff --git a/image/ruby-3.3.1.sh b/image/ruby-3.3.2.sh similarity index 100% rename from image/ruby-3.3.1.sh rename to image/ruby-3.3.2.sh