Merge branch 'master' into ajhodgson/upgrade-to-noble

phusion · Oct 14, 2024 · e8c31a8 · e8c31a8
2 parents 8c7244c + a6916b4
commit e8c31a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,6 +31,7 @@ jobs:
          - ruby32 # EOL: 2026-03-31
          - ruby31 # EOL: 2025-03-31
          # https://www.ruby-lang.org/en/downloads/branches/
+         - python313 # EOL: 2029-10-07
          - python312 # EOL: 2028-10-02
          - python311 # EOL: 2027-10-24
          - python310 # EOL: 2026-10-04

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ## 3.0.8 (release date: TBD)
  * Upgraded to Ruby 3.3.5
+ * Added a Python 3.13 image
 
 ## 3.0.7 (release date: 2024-07-30)
  * Upgraded to Ruby 3.3.4

diff --git a/Makefile b/Makefile
@@ -42,7 +42,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 := ruby31 ruby32 ruby33
-PYTHON_IMAGES := python38 python39 python310 python311 python312
+PYTHON_IMAGES := python38 python39 python310 python311 python312 python313
 MISC_IMAGES := jruby93 jruby94 nodejs
 
 ALL_IMAGES := $(SPECIAL_IMAGES) $(MISC_IMAGES) $(CRUBY_IMAGES) $(PYTHON_IMAGES)

diff --git a/README.md b/README.md
@@ -142,6 +142,7 @@ Python images
  * `phusion/passenger-python310` - Python 3.10
  * `phusion/passenger-python311` - Python 3.11
  * `phusion/passenger-python312` - Python 3.12
+ * `phusion/passenger-python312` - Python 3.13
 
 **Node.js and Meteor images**