Skip to content

Commit

Permalink
Upgrade to Ruby 3.3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ajhodgson authored and CamJN committed Nov 8, 2024
1 parent 21f848c commit e55010c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
- if you provide your own nginx.conf, please define error_log at the root scope, not the http scope; see https://github.com/phusion/passenger/issues/2541
- a number of modules are no longer installed and enabled by default (mod-http-geoip2, mod-http-image-filter, mod-http-xslt-filter, mod-mail, mod-stream, mod-stream-geoip2)
* Redis version is now 7.0.15 (from 6.0.16)
* Upgraded to Ruby 3.3.5
* Added a Python 3.13 image
* Dropped Python 3.8 image
* Upgraded to Ruby 3.2.6
* Upgraded to Ruby 3.3.6

## 3.0.7 (release date: 2024-07-30)
* Upgraded to Ruby 3.3.4
Expand Down
18 changes: 9 additions & 9 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.6, 3.3.5 and JRuby 9.3.15.0 and 9.4.8.0.
* Ruby 3.1.6, 3.2.6, 3.3.6 and JRuby 9.3.15.0 and 9.4.8.0.
* RVM is used to manage Ruby versions. [Why RVM?](#why_rvm)
* 3.3.5 is configured as the default.
* 3.3.6 is configured as the default.
* JRuby is installed from source, but we register an APT entry for it.
* JRuby uses OpenJDK 17.
* Python 3.12, or any version provided by the Deadsnakes PPA (currently 3.8, 3.9, 3.10, and 3.11; 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.6
RUN bash -lc 'rvm --default use ruby-3.2.6'
# Ruby 3.3.5
RUN bash -lc 'rvm --default use ruby-3.3.5'
# Ruby 3.3.6
RUN bash -lc 'rvm --default use ruby-3.3.6'
# JRuby 9.3.15.0
RUN bash -lc 'rvm --default use jruby-9.3.15.0'
# JRuby 9.4.8.0
Expand All @@ -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.5 ruby -v
Using /usr/local/rvm/gems/ruby-3.3.5
ruby 3.3.5 (2024-09-03 revision ef084cc8f4) [x86_64-linux]
$ rvm-exec 3.3.6 ruby -v
Using /usr/local/rvm/gems/ruby-3.3.6
ruby 3.3.6 (2024-11-05 revision 75015d4c1f) [x86_64-linux]
```

More examples, but with Bundler instead:

```bash
# This runs 'bundle install' using Ruby 3.3.5
rvm-exec 3.3.5 bundle install
# This runs 'bundle install' using Ruby 3.3.6
rvm-exec 3.3.6 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.5"
RVM_ID="ruby-3.3.6"

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 e55010c

Please sign in to comment.