From e9da8d619db17077b725c162e28fad533f8bdff9 Mon Sep 17 00:00:00 2001 From: Alan Hodgson Date: Tue, 3 Sep 2024 07:52:00 -0700 Subject: [PATCH] Upgrade to Ruby 3.3.5 [skip ci] --- CHANGELOG.md | 1 + README.md | 18 +++++++++--------- image/nginx-passenger.sh | 2 +- image/{ruby-3.3.4.sh => ruby-3.3.5.sh} | 0 4 files changed, 11 insertions(+), 10 deletions(-) rename image/{ruby-3.3.4.sh => ruby-3.3.5.sh} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cc00f76..672a6069 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## 3.0.8 (release date: TBD) + * Upgraded to Ruby 3.3.5 ## 3.0.7 (release date: 2024-07-30) * Upgraded to Ruby 3.3.4 diff --git a/README.md b/README.md index eca8ac30..a7ad6d7e 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.5, 3.3.4 and JRuby 9.3.15.0 and 9.4.8.0. + * Ruby 3.1.6, 3.2.5, 3.3.5 and JRuby 9.3.15.0 and 9.4.8.0. * RVM is used to manage Ruby versions. [Why RVM?](#why_rvm) - * 3.3.4 is configured as the default. + * 3.3.5 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.5 RUN bash -lc 'rvm --default use ruby-3.2.5' -# Ruby 3.3.4 -RUN bash -lc 'rvm --default use ruby-3.3.4' +# Ruby 3.3.5 +RUN bash -lc 'rvm --default use ruby-3.3.5' # JRuby 9.3.15.0 RUN bash -lc 'rvm --default use jruby-9.3.15.0' # JRuby 9.4.8.0 @@ -471,16 +471,16 @@ $ 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.4 ruby -v -Using /usr/local/rvm/gems/ruby-3.3.4 -ruby 3.3.4 (2024-07-09 revision be1089c8ec) [x86_64-linux] +$ rvm-exec 3.3.5 ruby -v +Using /usr/local/rvm/gems/ruby-3.3.5 +ruby 3.3.5 (2024-09-03 revision ef084cc8f4) [x86_64-linux] ``` More examples, but with Bundler instead: ```bash -# This runs 'bundle install' using Ruby 3.3.4 -rvm-exec 3.3.4 bundle install +# This runs 'bundle install' using Ruby 3.3.5 +rvm-exec 3.3.5 bundle install ``` diff --git a/image/nginx-passenger.sh b/image/nginx-passenger.sh index 50d48dc6..48dda223 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.4" + RVM_ID="ruby-3.3.5" run mkdir -p "/build_cache/${ARCH}" if [[ -e "/build_cache/${ARCH}/${RVM_ID}.tar.bz2" ]]; then diff --git a/image/ruby-3.3.4.sh b/image/ruby-3.3.5.sh similarity index 100% rename from image/ruby-3.3.4.sh rename to image/ruby-3.3.5.sh