bump version & add ruby 3.3.0

Makefile

@@ -5,7 +5,7 @@ REGISTRY = docker.io
 endif
 
 NAME ?= $(REGISTRY)/phusion/passenger
-VERSION ?= 2.6.1
+VERSION ?= 2.6.2
 
 # NAME and/or VERSION can be overriden during build if you are building locally to push to your own repository
 # example:
@@ -35,7 +35,7 @@ endif
 FORCE:
 
 SPECIAL_IMAGES := customizable full
-SINGLE_VERSION_IMAGES := jruby93 jruby94 nodejs ruby30 ruby31 ruby32
+SINGLE_VERSION_IMAGES := jruby93 jruby94 nodejs ruby30 ruby31 ruby32 ruby33
 
 ALL_IMAGES := $(SPECIAL_IMAGES) $(SINGLE_VERSION_IMAGES)
 

image/install_image.sh

@@ -8,6 +8,7 @@ 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 [[ "$jruby93" = 1 ]]; then run /pd_build/jruby-9.3.*.sh; fi
 if [[ "$jruby94" = 1 ]]; then run /pd_build/jruby-9.4.*.sh; fi
 if [[ "$python" = 1 ]]; then run /pd_build/python.sh; fi

image/ruby-3.3.0.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+source /pd_build/buildconfig
+
+RVM_ID=$(basename "$0" | sed 's/.sh$//')
+
+header "Installing $RVM_ID"
+
+run mkdir -p "/build_cache/${ARCH}"
+if [[ -e "/build_cache/${ARCH}/${RVM_ID}.tar.bz2" ]]; then
+	# use cached ruby if present
+	run /usr/local/rvm/bin/rvm mount "/build_cache/${ARCH}/${RVM_ID}.tar.bz2"
+else
+	# otherwise build one
+	run minimal_apt_get_install rustc # For compiling Ruby with YJIT
+	MAKEFLAGS=-j$(nproc) run /usr/local/rvm/bin/rvm install $RVM_ID --disable-cache || ( cat /usr/local/rvm/log/*${RVM_ID}*/*.log && false )
+	run cd "/build_cache/${ARCH}"
+	run /usr/local/rvm/bin/rvm prepare "${RVM_ID}"
+	run cd /
+fi
+
+run /usr/local/rvm/bin/rvm-exec $RVM_ID@global gem install $DEFAULT_RUBY_GEMS --no-document
+# Make passenger_system_ruby work.
+run create_rvm_wrapper_script ruby3.3 $RVM_ID ruby
+run /pd_build/ruby_support/install_ruby_utils.sh
+run /pd_build/ruby_support/finalize.sh