drop ruby 3.0 it’s EOL

Author: CamJN

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.6 (release date: TBD)
+ * Removed Ruby 3.0 (EOL 2024-04-23)
+
 ## 3.0.5 (release date: 2024-05-18)
  * Upgraded to Phusion Passenger 6.0.22 (from 6.0.21).
 

Makefile

@@ -41,7 +41,7 @@ FORCE:
 
 # when adding a cRuby image, also update image/nginx-passenger.sh and image/ruby-support/finalize.sh
 SPECIAL_IMAGES := customizable full
-CRUBY_IMAGES := ruby30 ruby31 ruby32 ruby33
+CRUBY_IMAGES := ruby31 ruby32 ruby33
 PYTHON_IMAGES := python38 python39 python310 python311 python312
 MISC_IMAGES := jruby93 jruby94 nodejs
 

README.md

@@ -94,7 +94,7 @@ Basics (learn more at [baseimage-docker](http://phusion.github.io/baseimage-dock
 
 Language support:
 
- * Ruby 3.0.7, 3.1.5, 3.2.4, 3.3.1 and JRuby 9.3.14.0 and 9.4.6.0.
+ * Ruby 3.1.5, 3.2.4, 3.3.1 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.
    * 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
 
 **Ruby images**
 
- * `phusion/passenger-ruby30` - Ruby 3.0.
  * `phusion/passenger-ruby31` - Ruby 3.1.
  * `phusion/passenger-ruby32` - Ruby 3.2.
  * `phusion/passenger-ruby33` - Ruby 3.3.
@@ -181,7 +180,6 @@ So put the following in your Dockerfile:
 # a list of version numbers.
 FROM phusion/passenger-full:<VERSION>
 # Or, instead of the 'full' variant, use one of these:
-#FROM phusion/passenger-ruby30:<VERSION>
 #FROM phusion/passenger-ruby31:<VERSION>
 #FROM phusion/passenger-ruby32:<VERSION>
 #FROM phusion/passenger-ruby33:<VERSION>
@@ -214,7 +212,6 @@ CMD ["/sbin/my_init"]
 #RUN /pd_build/nodejs.sh 18
 #
 #   Ruby support
-#RUN /pd_build/ruby-3.0.*.sh
 #RUN /pd_build/ruby-3.1.*.sh
 #RUN /pd_build/ruby-3.2.*.sh
 #RUN /pd_build/ruby-3.3.*.sh
@@ -280,8 +277,6 @@ server {
     passenger_ruby /usr/bin/ruby3.2;
     # For Ruby 3.1
     passenger_ruby /usr/bin/ruby3.1;
-    # For Ruby 3.0
-    passenger_ruby /usr/bin/ruby3.0;
 
     # For Python ie. Django
     passenger_app_type wsgi;
@@ -452,8 +447,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.0.7
-RUN bash -lc 'rvm --default use ruby-3.0.7'
 # Ruby 3.1.5
 RUN bash -lc 'rvm --default use ruby-3.1.5'
 # Ruby 3.2.4
@@ -843,7 +836,6 @@ Start a virtual machine with Docker in it. You can use the Vagrantfile that we'v
 
 Build one of the images:
 
-    make build_ruby30
     make build_ruby31
     make build_ruby32
     make build_ruby33

image/install_image.sh

@@ -5,12 +5,13 @@ source /pd_build/buildconfig
 # base cleans up apt before here now
 run apt-get update
 
-if [[ "$ruby30" = 1 ]]; then run /pd_build/ruby-3.0.*.sh; fi
 if [[ "$ruby31" = 1 ]]; then run /pd_build/ruby-3.1.*.sh; fi
 if [[ "$ruby32" = 1 ]]; then run /pd_build/ruby-3.2.*.sh; fi
 if [[ "$ruby33" = 1 ]]; then run /pd_build/ruby-3.3.*.sh; fi
+if [[ "$ruby34" = 1 ]]; then run /pd_build/ruby-3.4.*.sh; fi
 if [[ "$jruby93" = 1 ]]; then run /pd_build/jruby-9.3.*.sh; fi
 if [[ "$jruby94" = 1 ]]; then run /pd_build/jruby-9.4.*.sh; fi
+if [[ "$jruby95" = 1 ]]; then run /pd_build/jruby-9.5.*.sh; fi
 if [[ "$nodejs" = 1 ]]; then run /pd_build/nodejs.sh; fi
 if [[ "$redis" = 1 ]]; then run /pd_build/redis.sh; fi
 if [[ "$memcached" = 1 ]]; then run /pd_build/memcached.sh; fi
@@ -19,6 +20,7 @@ if [[ "$python39" = 1 ]]; then run /pd_build/python.sh 3.9; fi
 if [[ "$python310" = 1 ]]; then run /pd_build/python.sh 3.10; fi
 if [[ "$python311" = 1 ]]; then run /pd_build/python.sh 3.11; fi
 if [[ "$python312" = 1 ]]; then run /pd_build/python.sh 3.12; fi
+if [[ "$python313" = 1 ]]; then run /pd_build/python.sh 3.13; fi
 
 # Must be installed after Ruby, so that we don't end up with two Ruby versions.
 run /pd_build/nginx-passenger.sh

image/nginx-passenger.sh

@@ -59,6 +59,10 @@ run sed -i -e '/sv 1 nginx.*/a\' -e '		passenger-config reopen-logs >/dev/null 2
 run rm -f /var/log/nginx/error.log
 
 ## Precompile Ruby extensions.
+if [[ -e /usr/bin/ruby3.4 ]]; then
+	run ruby3.4 -S passenger-config build-native-support
+	run setuser app ruby3.4 -S passenger-config build-native-support
+fi
 if [[ -e /usr/bin/ruby3.3 ]]; then
 	run ruby3.3 -S passenger-config build-native-support
 	run setuser app ruby3.3 -S passenger-config build-native-support
@@ -71,9 +75,9 @@ 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/ruby3.0 ]]; then
-	run ruby3.0 -S passenger-config build-native-support
-	run setuser app ruby3.0 -S passenger-config build-native-support
+if [[ -e /usr/bin/jruby9.5 ]]; then
+	run jruby9.5 --dev -S passenger-config build-native-support
+	run setuser app jruby9.5 -S passenger-config build-native-support
 fi
 if [[ -e /usr/bin/jruby9.4 ]]; then
 	run jruby9.4 --dev -S passenger-config build-native-support