Skip to content

Commit d5627b6

Browse files
committed
Cleanups from Ruby 3.1 removal.
1 parent 35fe046 commit d5627b6

File tree

4 files changed

+1
-43
lines changed

4 files changed

+1
-43
lines changed

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock
9494

9595
Language support:
9696

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

130130
**Ruby images**
131131

132-
* `phusion/passenger-ruby31` - Ruby 3.1.
133132
* `phusion/passenger-ruby32` - Ruby 3.2.
134133
* `phusion/passenger-ruby33` - Ruby 3.3.
135134
* `phusion/passenger-ruby34` - Ruby 3.4.
@@ -214,7 +213,6 @@ CMD ["/sbin/my_init"]
214213
#RUN /pd_build/nodejs.sh 20
215214
#
216215
# Ruby support
217-
#RUN /pd_build/ruby-3.1.*.sh
218216
#RUN /pd_build/ruby-3.2.*.sh
219217
#RUN /pd_build/ruby-3.3.*.sh
220218
#RUN /pd_build/ruby-3.4.*.sh
@@ -280,8 +278,6 @@ server {
280278
passenger_ruby /usr/bin/ruby3.3;
281279
# For Ruby 3.2
282280
passenger_ruby /usr/bin/ruby3.2;
283-
# For Ruby 3.1
284-
passenger_ruby /usr/bin/ruby3.1;
285281
286282
# For Python ie. Django
287283
passenger_app_type wsgi;
@@ -452,8 +448,6 @@ We use [RVM](https://rvm.io/) to install and to manage Ruby interpreters. Becaus
452448
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.
453449

454450
```dockerfile
455-
# Ruby 3.1.7
456-
RUN bash -lc 'rvm --default use ruby-3.1.7'
457451
# Ruby 3.2.8
458452
RUN bash -lc 'rvm --default use ruby-3.2.8'
459453
# Ruby 3.3.7

image/nginx-passenger.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ if [[ -e /usr/bin/ruby3.2 ]]; then
7171
run ruby3.2 -S passenger-config build-native-support
7272
run setuser app ruby3.2 -S passenger-config build-native-support
7373
fi
74-
if [[ -e /usr/bin/ruby3.1 ]]; then
75-
run ruby3.1 -S passenger-config build-native-support
76-
run setuser app ruby3.1 -S passenger-config build-native-support
77-
fi
7874
if [[ -e /usr/bin/jruby9.4 ]]; then
7975
run jruby9.4 --dev -S passenger-config build-native-support
8076
run setuser app jruby9.4 -S passenger-config build-native-support

image/ruby-3.1.7.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

image/ruby_support/finalize.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ elif [[ "$known_rubies" =~ ruby-3\.3 ]]; then
3030
set_rvm_default ruby-3\.3
3131
elif [[ "$known_rubies" =~ ruby-3\.2 ]]; then
3232
set_rvm_default ruby-3\.2
33-
elif [[ "$known_rubies" =~ ruby-3\.1 ]]; then
34-
set_rvm_default ruby-3\.1
3533
elif [[ "$known_rubies" =~ jruby ]]; then
3634
set_rvm_default jruby
3735
fi

0 commit comments

Comments
 (0)