Skip to content

Upgrade to Ruby 3.3.8 (and cleanup ruby 3.1 remainders). #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CamJN merged 2 commits into from
Apr 9, 2025
Merged

Upgrade to Ruby 3.3.8 (and cleanup ruby 3.1 remainders). #434

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5627b6
Cleanups from Ruby 3.1 removal.
ajhodgson Apr 9, 2025
b6a0e7e
Upgrade to Ruby 3.3.8
ajhodgson Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Cleanups from Ruby 3.1 removal.
  • Loading branch information
@ajhodgson
ajhodgson committed Apr 9, 2025
commit d5627b60d66b4fdbc276f5e1dfd1279dd1a00014
8 changes: 1 addition & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock

Language support:

* Ruby 3.1.7, 3.2.8, 3.3.7, 3.4.2 and JRuby 9.3.15.0 and 9.4.9.0.
* Ruby 3.2.8, 3.3.7, 3.4.2 and JRuby 9.3.15.0 and 9.4.9.0.
* RVM is used to manage Ruby versions. [Why RVM?](#why_rvm)
* 3.4.2 is configured as the default.
* JRuby is installed from source, but we register an APT entry for it.
Expand Down Expand Up @@ -129,7 +129,6 @@ Passenger-docker consists of several images, each one tailor made for a specific

**Ruby images**

* `phusion/passenger-ruby31` - Ruby 3.1.
* `phusion/passenger-ruby32` - Ruby 3.2.
* `phusion/passenger-ruby33` - Ruby 3.3.
* `phusion/passenger-ruby34` - Ruby 3.4.
Expand Down Expand Up @@ -214,7 +213,6 @@ CMD ["/sbin/my_init"]
#RUN /pd_build/nodejs.sh 20
#
# Ruby support
#RUN /pd_build/ruby-3.1.*.sh
#RUN /pd_build/ruby-3.2.*.sh
#RUN /pd_build/ruby-3.3.*.sh
#RUN /pd_build/ruby-3.4.*.sh
Expand Down Expand Up @@ -280,8 +278,6 @@ server {
passenger_ruby /usr/bin/ruby3.3;
# For Ruby 3.2
passenger_ruby /usr/bin/ruby3.2;
# For Ruby 3.1
passenger_ruby /usr/bin/ruby3.1;
# For Python ie. Django
passenger_app_type wsgi;
Expand Down Expand Up @@ -452,8 +448,6 @@ We use [RVM](https://rvm.io/) to install and to manage Ruby interpreters. Becaus
The default Ruby (what the `/usr/bin/ruby` command executes) is the latest Ruby version that you've chosen to install. You can use RVM select a different version as default.

```dockerfile
# Ruby 3.1.7
RUN bash -lc 'rvm --default use ruby-3.1.7'
# Ruby 3.2.8
RUN bash -lc 'rvm --default use ruby-3.2.8'
# Ruby 3.3.7
Expand Down
4 changes: 0 additions & 4 deletions image/nginx-passenger.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ if [[ -e /usr/bin/ruby3.2 ]]; then
run ruby3.2 -S passenger-config build-native-support
run setuser app ruby3.2 -S passenger-config build-native-support
fi
if [[ -e /usr/bin/ruby3.1 ]]; then
run ruby3.1 -S passenger-config build-native-support
run setuser app ruby3.1 -S passenger-config build-native-support
fi
if [[ -e /usr/bin/jruby9.4 ]]; then
run jruby9.4 --dev -S passenger-config build-native-support
run setuser app jruby9.4 -S passenger-config build-native-support
Expand Down
30 changes: 0 additions & 30 deletions image/ruby-3.1.7.sh
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions image/ruby_support/finalize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ elif [[ "$known_rubies" =~ ruby-3\.3 ]]; then
set_rvm_default ruby-3\.3
elif [[ "$known_rubies" =~ ruby-3\.2 ]]; then
set_rvm_default ruby-3\.2
elif [[ "$known_rubies" =~ ruby-3\.1 ]]; then
set_rvm_default ruby-3\.1
elif [[ "$known_rubies" =~ jruby ]]; then
set_rvm_default jruby
fi
Expand Down