Skip to content

Commit

Permalink
Upgrade to Ruby 3.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ajhodgson authored and CamJN committed May 30, 2024
1 parent 22dfd0b commit 46e0006
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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
Expand All @@ -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
```

<a name="default_ruby_wrapper_scripts"></a>
Expand Down
2 changes: 1 addition & 1 deletion image/nginx-passenger.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.

0 comments on commit 46e0006

Please sign in to comment.