From e11b053155d249d9942a5d0d3c7c55fa6f99058c Mon Sep 17 00:00:00 2001
From: Camden Narzt <c.narzt@me.com>
Date: Mon, 14 Oct 2024 12:02:04 -0600
Subject: [PATCH] drop python 3.8

---
 CHANGELOG.md           | 1 +
 Makefile               | 2 +-
 README.md              | 5 ++---
 image/install_image.sh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfee481d..8a1d1073 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 3.0.8 (release date: TBD)
  * Upgraded to Ruby 3.3.5
  * Added a Python 3.13 image
+ * Dropped Python 3.8 image
 
 ## 3.0.7 (release date: 2024-07-30)
  * Upgraded to Ruby 3.3.4
diff --git a/Makefile b/Makefile
index c3bec6b2..41901005 100644
--- 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 python313
+PYTHON_IMAGES := 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
index 3526fed5..9dd22e04 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,6 @@ Passenger-docker consists of several images, each one tailor made for a specific
 
 Python images
 
- * `phusion/passenger-python38` - Python 3.8
  * `phusion/passenger-python39` - Python 3.9
  * `phusion/passenger-python310` - Python 3.10
  * `phusion/passenger-python311` - Python 3.11
@@ -184,11 +183,11 @@ FROM phusion/passenger-full:<VERSION>
 #FROM phusion/passenger-ruby31:<VERSION>
 #FROM phusion/passenger-ruby32:<VERSION>
 #FROM phusion/passenger-ruby33:<VERSION>
-#FROM phusion/passenger-python38:<VERSION>
 #FROM phusion/passenger-python39:<VERSION>
 #FROM phusion/passenger-python310:<VERSION>
 #FROM phusion/passenger-python311:<VERSION>
 #FROM phusion/passenger-python312:<VERSION>
+#FROM phusion/passenger-python313:<VERSION>
 #FROM phusion/passenger-jruby93:<VERSION>
 #FROM phusion/passenger-jruby94:<VERSION>
 #FROM phusion/passenger-nodejs:<VERSION>
@@ -844,11 +843,11 @@ Build one of the images:
     make build_ruby31
     make build_ruby32
     make build_ruby33
-    make build_python38
     make build_python39
     make build_python310
     make build_python311
     make build_python312
+    make build_python313
     make build_jruby93
     make build_jruby94
     make build_nodejs
diff --git a/image/install_image.sh b/image/install_image.sh
index 6c6a03bb..b06ec3d0 100755
--- a/image/install_image.sh
+++ b/image/install_image.sh
@@ -15,12 +15,12 @@ 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
-if [[ "$python38" = 1 ]]; then run /pd_build/python.sh 3.8; fi
 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
+if [[ "$python314" = 1 ]]; then run /pd_build/python.sh 3.14; fi
 
 # Must be installed after Ruby, so that we don't end up with two Ruby versions.
 run /pd_build/nginx-passenger.sh