add debian trixie

Author: CamJN

debian_specs/passenger/helpers.rb

@@ -31,9 +31,11 @@ def ruby_package_dependencies
       "ruby2.5, ruby2.5-dev"
     elsif is_distribution?("<= bullseye")
       "ruby2.7, ruby2.7-dev"
-    else
-      # bookworm
+    elsif is_distribution?("<= bookworm")
       "ruby3.1, ruby3.1-dev"
+    else
+      # trixie
+      "ruby3.3, ruby3.3-dev"
     end
   else
     raise "Unknown distribution class"
@@ -69,8 +71,10 @@ def distro_ruby_versions
       ["2.5"]
     elsif is_distribution?("<= bullseye")
       ["2.7"]
-    else
+    elsif is_distribution?("<= bookworm")
       ["3.1"]
+    else
+      ["3.3"]
     end
   else
     raise "Unknown distribution class"

docker-images/testbox-debian-10/Dockerfile renamed to docker-images/testbox-debian-13/Dockerfile

@@ -1,3 +1,3 @@
-FROM debian:10
+FROM debian:13
 ADD . /paa_build
 RUN bash /paa_build/install.sh

docker-images/testbox-debian-10/Gemfile renamed to docker-images/testbox-debian-13/Gemfile

@@ -23,6 +23,7 @@ function create_user()
 		adduser --uid $id --gid $id --disabled-password --gecos "$full_name" $name
 	fi
 	usermod -L $name
+	chmod o+rx /home/$name
 }
 
 function create_group()
@@ -39,17 +40,20 @@ export LC_ALL=C.UTF-8
 export DEBIAN_FRONTEND=noninteractive
 export HOME=/root
 
-header "Creating users and directories"
-run create_user app "Passenger APT Automation" 2446
-
 header "Installing dependencies"
 run apt-get update -q
 run apt-get install -y -q apt-utils
 run apt-get install -y -q build-essential gdebi-core ruby ruby-dev rake \
-	libcurl4-openssl-dev zlib1g-dev libssl-dev wget curl python git \
+	libcurl4-openssl-dev zlib1g-dev libssl-dev wget curl python3 git \
 	ccache reprepro libsqlite3-dev apt-transport-https systemd \
-	ca-certificates ruby-nokogiri distro-info-data
+	ca-certificates gnupg python-is-python3 ruby-nokogiri distro-info-data \
+	adduser
 run ln -s /usr/bin/python3 /bin/my_init_python
+
+header "Creating users and directories"
+run create_user app "Passenger APT Automation" 2446
+
+header "Installing Ruby deps"
 run gem install bundler -v '~>1.0' --no-document
 run env BUNDLE_GEMFILE=/paa_build/Gemfile bundle install
 

docker-images/testbox-debian-10/Gemfile.lock renamed to docker-images/testbox-debian-13/Gemfile.lock

@@ -3,6 +3,9 @@
 require 'csv'
 require 'nokogiri'
 
+# After editing this file regenerate distro_info.sh by running:
+# internal/scripts/regen_distro_info_script.sh
+
 def gen_distros(family)
   throw "must be run from #{family}" unless File.exist?("/usr/share/distro-info/#{family}.csv")
   CSV.read("/usr/share/distro-info/#{family}.csv", headers: true).each_with_object(Hash.new) { |r, a|
@@ -24,6 +27,7 @@ def gen_distros(family)
 
   bullseye
   bookworm
+  trixie
 )
 
 ###### Helper methods ######

docker-images/testbox-debian-10/install.sh renamed to docker-images/testbox-debian-13/install.sh

@@ -8,8 +8,8 @@
 # internal/scripts/regen_distro_info_script.sh
 
 # shellcheck disable=SC2034
-DEFAULT_DISTROS="focal jammy noble plucky bullseye bookworm"
-DEBIAN_DISTROS="11 12"
+DEFAULT_DISTROS="focal jammy noble plucky bullseye bookworm trixie"
+DEBIAN_DISTROS="11 12 13"
 UBUNTU_DISTROS="20.04 22.04 24.04 25.04"
 
 
@@ -46,7 +46,7 @@ function to_distro_codename()
 
 function get_buildbox_image()
 {
-	echo "phusion/passenger_apt_automation_buildbox:2.2.2"
+	echo "phusion/passenger_apt_automation_buildbox:2.2.3"
 }
 
 function to_testbox_image()

internal/lib/distro_info.rb

@@ -18,7 +18,7 @@ fi
 if [[ "$1" == "buildbox_name" ]]; then
 	echo -n "phusion/passenger_apt_automation_buildbox"
 elif [[ "$1" == "buildbox_version" ]]; then
-	echo -n "2.2.2"
+	echo -n "2.2.3"
 elif [[ "$1" == "testbox_base_name" ]]; then
 	echo -n "phusion/passenger_apt_automation_testbox"
 elif [[ "$1" == "testbox_version" ]]; then