Remove Ruby 3.0; EOL: 2024-03-31

phusion · May 29, 2024 · 65b2b2c · 65b2b2c
1 parent c478960
commit 65b2b2c
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 74 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,7 +30,6 @@ jobs:
          - ruby33 # EOL: 2027-03-31
          - ruby32 # EOL: 2026-03-31
          - ruby31 # EOL: 2025-03-31
-         - ruby30 # EOL: 2024-03-31
          # https://www.ruby-lang.org/en/downloads/branches/
          - python312 # EOL: 2028-10-02
          - python311 # EOL: 2027-10-24

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## not released
+ * Removed Ruby 3.0 (EOL: 2024-03-31)
+
 ## 3.0.5 (release date: 2024-05-18)
  * Upgraded to Phusion Passenger 6.0.22 (from 6.0.21).
 

diff --git a/Makefile b/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
 

diff --git a/README.md b/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

diff --git a/image/install_image.sh b/image/install_image.sh
@@ -5,7 +5,6 @@ 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

diff --git a/image/install_openssl1.1.sh b/image/install_openssl1.1.sh
diff --git a/image/nginx-passenger.sh b/image/nginx-passenger.sh
@@ -71,10 +71,6 @@ 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
-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

diff --git a/image/ruby-3.0.7.sh b/image/ruby-3.0.7.sh
diff --git a/image/ruby_support/finalize.sh b/image/ruby_support/finalize.sh
@@ -30,8 +30,6 @@ 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" =~ ruby-3\.0 ]]; then
-	set_rvm_default ruby-3\.0
 elif [[ "$known_rubies" =~ jruby ]]; then
 	set_rvm_default jruby
 fi