From 595150f48a522b8030055ac69d14081278fb2d6e Mon Sep 17 00:00:00 2001
From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com>
Date: Wed, 26 May 2021 10:02:42 +0200
Subject: [PATCH 1/5] Update Python 3.7 runtime version

---
 al2/aarch64/standard/2.0/Dockerfile           |  2 +-
 .../2.0/tools/runtime_configs/python/3.7.10   | 17 +++++++++++++++++
 .../2.0/tools/runtime_configs/python/3.7.7    | 19 -------------------
 3 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.10
 delete mode 100644 al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.7

diff --git a/al2/aarch64/standard/2.0/Dockerfile b/al2/aarch64/standard/2.0/Dockerfile
index bdcb5de1..76229ae3 100644
--- a/al2/aarch64/standard/2.0/Dockerfile
+++ b/al2/aarch64/standard/2.0/Dockerfile
@@ -242,7 +242,7 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
 #**************** END RUBY *****************************************************
 
 #**************** PYTHON *****************************************************
-ENV PYTHON_37_VERSION="3.7.7"
+ENV PYTHON_37_VERSION="3.7.10"
 ENV PYTHON_PIP_VERSION=20.1.1
 ENV PYYAML_VERSION=5.3.1
 ENV DOCKER_COMPOSE_VERSION="1.26.0"
diff --git a/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.10 b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.10
new file mode 100644
index 00000000..35be7700
--- /dev/null
+++ b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.10
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.10
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.7.10" "https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz#f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b" standard verify_py37 copy_python_gdb ensurepip
+else
+  install_package "Python-3.7.10" "https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tgz#c9649ad84dc3a434c8637df6963100b2e5608697f9ba56d82e3809e4148e0975" standard verify_py37 copy_python_gdb ensurepip
+fi
diff --git a/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.7 b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.7
deleted file mode 100644
index bebb3561..00000000
--- a/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.7.7
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"  
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.7.7
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.7.7" "https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tar.xz#06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136" standard verify_py37 copy_python_gdb ensurepip
-else
-  install_package "Python-3.7.7" "https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tgz#8c8be91cd2648a1a0c251f04ea0bb4c2a5570feb9c45eaaa2241c785585b475a" standard verify_py37 copy_python_gdb ensurepip
-fi
-
-

From 0986de90696ffa1aa7233ea8036153d5219c1379 Mon Sep 17 00:00:00 2001
From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com>
Date: Wed, 26 May 2021 10:12:17 +0200
Subject: [PATCH 2/5] Update Python 3.8 runtime version

---
 al2/aarch64/standard/2.0/Dockerfile           |  2 +-
 .../2.0/tools/runtime_configs/python/3.8.10   | 17 +++++++++++++++++
 .../2.0/tools/runtime_configs/python/3.8.3    | 19 -------------------
 al2/x86_64/standard/2.0/Dockerfile            |  2 +-
 .../2.0/tools/runtime_configs/python/3.8.10   | 17 +++++++++++++++++
 .../2.0/tools/runtime_configs/python/3.8.8    | 19 -------------------
 al2/x86_64/standard/3.0/Dockerfile            |  2 +-
 .../3.0/tools/runtime_configs/python/3.8.10   | 17 +++++++++++++++++
 .../3.0/tools/runtime_configs/python/3.8.8    | 19 -------------------
 ubuntu/standard/3.0/Dockerfile                |  2 +-
 .../3.0/tools/runtime_configs/python/3.8.10   | 17 +++++++++++++++++
 .../3.0/tools/runtime_configs/python/3.8.8    | 19 -------------------
 ubuntu/standard/4.0/Dockerfile                |  2 +-
 .../4.0/tools/runtime_configs/python/3.8.10   | 17 +++++++++++++++++
 .../4.0/tools/runtime_configs/python/3.8.8    | 19 -------------------
 ubuntu/standard/5.0/Dockerfile                |  2 +-
 .../5.0/tools/runtime_configs/python/3.8.10   | 17 +++++++++++++++++
 .../5.0/tools/runtime_configs/python/3.8.8    | 17 -----------------
 18 files changed, 108 insertions(+), 118 deletions(-)
 create mode 100644 al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.10
 delete mode 100644 al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.3
 create mode 100644 al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.10
 delete mode 100644 al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.8
 create mode 100644 al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.10
 delete mode 100644 al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.8
 create mode 100644 ubuntu/standard/3.0/tools/runtime_configs/python/3.8.10
 delete mode 100644 ubuntu/standard/3.0/tools/runtime_configs/python/3.8.8
 create mode 100644 ubuntu/standard/4.0/tools/runtime_configs/python/3.8.10
 delete mode 100644 ubuntu/standard/4.0/tools/runtime_configs/python/3.8.8
 create mode 100644 ubuntu/standard/5.0/tools/runtime_configs/python/3.8.10
 delete mode 100644 ubuntu/standard/5.0/tools/runtime_configs/python/3.8.8

diff --git a/al2/aarch64/standard/2.0/Dockerfile b/al2/aarch64/standard/2.0/Dockerfile
index 76229ae3..65d89ead 100644
--- a/al2/aarch64/standard/2.0/Dockerfile
+++ b/al2/aarch64/standard/2.0/Dockerfile
@@ -348,7 +348,7 @@ RUN set -ex \
     && chmod +x /usr/local/bin/dind
 
 #Python 3.8
-ENV PYTHON_38_VERSION="3.8.3"
+ENV PYTHON_38_VERSION="3.8.10"
 
 COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION; rm -rf /tmp/*
diff --git a/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.10 b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.10
new file mode 100644
index 00000000..87e42a85
--- /dev/null
+++ b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.10
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.10
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz#6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tgz#b37ac74d2cbad2590e7cd0dd2b3826c29afe89a734090a87bf8c03c45066cb65" standard verify_py38 copy_python_gdb ensurepip
+fi
diff --git a/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.3 b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.3
deleted file mode 100644
index 49743eee..00000000
--- a/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.8.3
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.3
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.0j" "https://www.openssl.org/source/old/1.1.0/openssl-1.1.0j.tar.gz#31bec6c203ce1a8e93d5994f4ed304c63ccf07676118b6634edded12ad1b3246" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.8.3" "https://www.python.org/ftp/python/3.8.3/Python-3.8.3.tar.xz#dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864" standard verify_py38 copy_python_gdb ensurepip
-else
-  install_package "Python-3.8.3" "https://www.python.org/ftp/python/3.8.3/Python-3.8.3.tgz#6af6d4d2e010f9655518d0fc6738c7ff7069f10a4d2fbd55509e467f092a8b90" standard verify_py38 copy_python_gdb ensurepip
-fi
-
-
diff --git a/al2/x86_64/standard/2.0/Dockerfile b/al2/x86_64/standard/2.0/Dockerfile
index 717a6e93..6919deb9 100644
--- a/al2/x86_64/standard/2.0/Dockerfile
+++ b/al2/x86_64/standard/2.0/Dockerfile
@@ -394,7 +394,7 @@ RUN set -ex \
     && docker-compose version
 
 #Python 3.8
-ENV PYTHON_38_VERSION="3.8.8"
+ENV PYTHON_38_VERSION="3.8.10"
 
 COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION; rm -rf /tmp/*
diff --git a/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.10 b/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.10
new file mode 100644
index 00000000..87e42a85
--- /dev/null
+++ b/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.10
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.10
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz#6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tgz#b37ac74d2cbad2590e7cd0dd2b3826c29afe89a734090a87bf8c03c45066cb65" standard verify_py38 copy_python_gdb ensurepip
+fi
diff --git a/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.8 b/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.8
deleted file mode 100644
index 4091deb5..00000000
--- a/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.8.8
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.8
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz#7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc" standard verify_py38 copy_python_gdb ensurepip
-else
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tgz#76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7" standard verify_py38 copy_python_gdb ensurepip
-fi
-
-
diff --git a/al2/x86_64/standard/3.0/Dockerfile b/al2/x86_64/standard/3.0/Dockerfile
index 1448d953..cc5f82fd 100644
--- a/al2/x86_64/standard/3.0/Dockerfile
+++ b/al2/x86_64/standard/3.0/Dockerfile
@@ -387,7 +387,7 @@ RUN set -ex \
     && docker-compose version
 
 #Python 3.8
-ENV PYTHON_38_VERSION="3.8.8"
+ENV PYTHON_38_VERSION="3.8.10"
 
 COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION; rm -rf /tmp/*
diff --git a/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.10 b/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.10
new file mode 100644
index 00000000..87e42a85
--- /dev/null
+++ b/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.10
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.10
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz#6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tgz#b37ac74d2cbad2590e7cd0dd2b3826c29afe89a734090a87bf8c03c45066cb65" standard verify_py38 copy_python_gdb ensurepip
+fi
diff --git a/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.8 b/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.8
deleted file mode 100644
index 4091deb5..00000000
--- a/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.8.8
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.8
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz#7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc" standard verify_py38 copy_python_gdb ensurepip
-else
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tgz#76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7" standard verify_py38 copy_python_gdb ensurepip
-fi
-
-
diff --git a/ubuntu/standard/3.0/Dockerfile b/ubuntu/standard/3.0/Dockerfile
index 94e09eff..eafda3e9 100644
--- a/ubuntu/standard/3.0/Dockerfile
+++ b/ubuntu/standard/3.0/Dockerfile
@@ -233,7 +233,7 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 #**************** END RUBY *****************************************************
 
 #**************** PYTHON *****************************************************
-ENV PYTHON_38_VERSION="3.8.8" \
+ENV PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
 ENV PYTHON_PIP_VERSION=19.3.1
diff --git a/ubuntu/standard/3.0/tools/runtime_configs/python/3.8.10 b/ubuntu/standard/3.0/tools/runtime_configs/python/3.8.10
new file mode 100644
index 00000000..87e42a85
--- /dev/null
+++ b/ubuntu/standard/3.0/tools/runtime_configs/python/3.8.10
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.10
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz#6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tgz#b37ac74d2cbad2590e7cd0dd2b3826c29afe89a734090a87bf8c03c45066cb65" standard verify_py38 copy_python_gdb ensurepip
+fi
diff --git a/ubuntu/standard/3.0/tools/runtime_configs/python/3.8.8 b/ubuntu/standard/3.0/tools/runtime_configs/python/3.8.8
deleted file mode 100644
index 4091deb5..00000000
--- a/ubuntu/standard/3.0/tools/runtime_configs/python/3.8.8
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.8
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz#7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc" standard verify_py38 copy_python_gdb ensurepip
-else
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tgz#76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7" standard verify_py38 copy_python_gdb ensurepip
-fi
-
-
diff --git a/ubuntu/standard/4.0/Dockerfile b/ubuntu/standard/4.0/Dockerfile
index 40ebf738..58c49f42 100644
--- a/ubuntu/standard/4.0/Dockerfile
+++ b/ubuntu/standard/4.0/Dockerfile
@@ -241,7 +241,7 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 #**************** END RUBY *****************************************************
 
 #**************** PYTHON *****************************************************
-ENV PYTHON_38_VERSION="3.8.8" \
+ENV PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
 ENV PYTHON_PIP_VERSION=20.2.4
diff --git a/ubuntu/standard/4.0/tools/runtime_configs/python/3.8.10 b/ubuntu/standard/4.0/tools/runtime_configs/python/3.8.10
new file mode 100644
index 00000000..87e42a85
--- /dev/null
+++ b/ubuntu/standard/4.0/tools/runtime_configs/python/3.8.10
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.10
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz#6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tgz#b37ac74d2cbad2590e7cd0dd2b3826c29afe89a734090a87bf8c03c45066cb65" standard verify_py38 copy_python_gdb ensurepip
+fi
diff --git a/ubuntu/standard/4.0/tools/runtime_configs/python/3.8.8 b/ubuntu/standard/4.0/tools/runtime_configs/python/3.8.8
deleted file mode 100644
index 4091deb5..00000000
--- a/ubuntu/standard/4.0/tools/runtime_configs/python/3.8.8
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.8
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz#7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc" standard verify_py38 copy_python_gdb ensurepip
-else
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tgz#76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7" standard verify_py38 copy_python_gdb ensurepip
-fi
-
-
diff --git a/ubuntu/standard/5.0/Dockerfile b/ubuntu/standard/5.0/Dockerfile
index 03b29235..41944547 100644
--- a/ubuntu/standard/5.0/Dockerfile
+++ b/ubuntu/standard/5.0/Dockerfile
@@ -226,7 +226,7 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
-ENV PYTHON_38_VERSION="3.8.8"
+ENV PYTHON_38_VERSION="3.8.10"
 ENV PYTHON_39_VERSION="3.9.2"
 
 ARG PYTHON_PIP_VERSION=20.3.3
diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.10 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.10
new file mode 100644
index 00000000..87e42a85
--- /dev/null
+++ b/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.10
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.10
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tar.xz#6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9" standard verify_py38 copy_python_gdb ensurepip
+else
+  install_package "Python-3.8.10" "https://www.python.org/ftp/python/3.8.10/Python-3.8.10.tgz#b37ac74d2cbad2590e7cd0dd2b3826c29afe89a734090a87bf8c03c45066cb65" standard verify_py38 copy_python_gdb ensurepip
+fi
diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.8 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.8
deleted file mode 100644
index c7a77a2f..00000000
--- a/ubuntu/standard/5.0/tools/runtime_configs/python/3.8.8
+++ /dev/null
@@ -1,17 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.8.8
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz#7c664249ff77e443d6ea0e4cf0e587eae918ca3c48d081d1915fe2a1f1bcc5cc" standard verify_py38 copy_python_gdb ensurepip
-else
-  install_package "Python-3.8.8" "https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tgz#76c0763f048e4f9b861d24da76b7dd5c7a3ba7ec086f40caedeea359263276f7" standard verify_py38 copy_python_gdb ensurepip
-fi

From 6c239e9abe9880759c84a980b53ed2e7cb6ccb43 Mon Sep 17 00:00:00 2001
From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com>
Date: Wed, 26 May 2021 10:14:41 +0200
Subject: [PATCH 3/5] Update Python pip to 21.1.2

---
 al2/aarch64/standard/2.0/Dockerfile | 2 +-
 al2/x86_64/standard/2.0/Dockerfile  | 2 +-
 al2/x86_64/standard/3.0/Dockerfile  | 2 +-
 ubuntu/standard/3.0/Dockerfile      | 2 +-
 ubuntu/standard/4.0/Dockerfile      | 2 +-
 ubuntu/standard/5.0/Dockerfile      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/al2/aarch64/standard/2.0/Dockerfile b/al2/aarch64/standard/2.0/Dockerfile
index 65d89ead..3a5535a3 100644
--- a/al2/aarch64/standard/2.0/Dockerfile
+++ b/al2/aarch64/standard/2.0/Dockerfile
@@ -243,7 +243,7 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
 
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
-ENV PYTHON_PIP_VERSION=20.1.1
+ENV PYTHON_PIP_VERSION=21.1.2
 ENV PYYAML_VERSION=5.3.1
 ENV DOCKER_COMPOSE_VERSION="1.26.0"
 
diff --git a/al2/x86_64/standard/2.0/Dockerfile b/al2/x86_64/standard/2.0/Dockerfile
index 6919deb9..4a89da68 100644
--- a/al2/x86_64/standard/2.0/Dockerfile
+++ b/al2/x86_64/standard/2.0/Dockerfile
@@ -325,7 +325,7 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
 
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
-ENV PYTHON_PIP_VERSION=19.3.1
+ENV PYTHON_PIP_VERSION=21.1.2
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
diff --git a/al2/x86_64/standard/3.0/Dockerfile b/al2/x86_64/standard/3.0/Dockerfile
index cc5f82fd..e4fe5b48 100644
--- a/al2/x86_64/standard/3.0/Dockerfile
+++ b/al2/x86_64/standard/3.0/Dockerfile
@@ -318,7 +318,7 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
 
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
-ENV PYTHON_PIP_VERSION=20.2.4
+ENV PYTHON_PIP_VERSION=21.1.2
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
diff --git a/ubuntu/standard/3.0/Dockerfile b/ubuntu/standard/3.0/Dockerfile
index eafda3e9..2fd80153 100644
--- a/ubuntu/standard/3.0/Dockerfile
+++ b/ubuntu/standard/3.0/Dockerfile
@@ -236,7 +236,7 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 ENV PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
-ENV PYTHON_PIP_VERSION=19.3.1
+ENV PYTHON_PIP_VERSION=21.1.2
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
diff --git a/ubuntu/standard/4.0/Dockerfile b/ubuntu/standard/4.0/Dockerfile
index 58c49f42..2b68f340 100644
--- a/ubuntu/standard/4.0/Dockerfile
+++ b/ubuntu/standard/4.0/Dockerfile
@@ -244,7 +244,7 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 ENV PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
-ENV PYTHON_PIP_VERSION=20.2.4
+ENV PYTHON_PIP_VERSION=21.1.2
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
diff --git a/ubuntu/standard/5.0/Dockerfile b/ubuntu/standard/5.0/Dockerfile
index 41944547..7a49f82b 100644
--- a/ubuntu/standard/5.0/Dockerfile
+++ b/ubuntu/standard/5.0/Dockerfile
@@ -229,7 +229,7 @@ ENV PYTHON_37_VERSION="3.7.10"
 ENV PYTHON_38_VERSION="3.8.10"
 ENV PYTHON_39_VERSION="3.9.2"
 
-ARG PYTHON_PIP_VERSION=20.3.3
+ARG PYTHON_PIP_VERSION=21.1.2
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*

From 515145c5872bf2aa2f1c5d74338d484c16054e3e Mon Sep 17 00:00:00 2001
From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com>
Date: Wed, 26 May 2021 10:23:25 +0200
Subject: [PATCH 4/5] Update Python PyYAML to 5.4.1

---
 al2/aarch64/standard/2.0/Dockerfile | 2 +-
 al2/x86_64/standard/2.0/Dockerfile  | 5 +++--
 al2/x86_64/standard/3.0/Dockerfile  | 5 +++--
 ubuntu/standard/3.0/Dockerfile      | 5 +++--
 ubuntu/standard/4.0/Dockerfile      | 5 +++--
 ubuntu/standard/5.0/Dockerfile      | 7 ++++---
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/al2/aarch64/standard/2.0/Dockerfile b/al2/aarch64/standard/2.0/Dockerfile
index 3a5535a3..f239045f 100644
--- a/al2/aarch64/standard/2.0/Dockerfile
+++ b/al2/aarch64/standard/2.0/Dockerfile
@@ -244,7 +244,7 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
 ENV PYTHON_PIP_VERSION=21.1.2
-ENV PYYAML_VERSION=5.3.1
+ENV PYYAML_VERSION=5.4.1
 ENV DOCKER_COMPOSE_VERSION="1.26.0"
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
diff --git a/al2/x86_64/standard/2.0/Dockerfile b/al2/x86_64/standard/2.0/Dockerfile
index 4a89da68..b06fd622 100644
--- a/al2/x86_64/standard/2.0/Dockerfile
+++ b/al2/x86_64/standard/2.0/Dockerfile
@@ -326,13 +326,14 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
 ENV PYTHON_PIP_VERSION=21.1.2
+ENV PYYAML_VERSION=5.4.1
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
 RUN   pyenv global  $PYTHON_37_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.1.2" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
 
 #**************** END PYTHON *****************************************************
@@ -401,7 +402,7 @@ RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSI
 RUN   pyenv global  $PYTHON_38_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.1.2" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
 
 # Node 12
diff --git a/al2/x86_64/standard/3.0/Dockerfile b/al2/x86_64/standard/3.0/Dockerfile
index e4fe5b48..7816086e 100644
--- a/al2/x86_64/standard/3.0/Dockerfile
+++ b/al2/x86_64/standard/3.0/Dockerfile
@@ -319,13 +319,14 @@ RUN rbenv install $RUBY_26_VERSION; rm -rf /tmp/*; rbenv global $RUBY_26_VERSION
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
 ENV PYTHON_PIP_VERSION=21.1.2
+ENV PYYAML_VERSION=5.4.1
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
 RUN   pyenv global  $PYTHON_37_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 #**************** END PYTHON *****************************************************
@@ -394,7 +395,7 @@ RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSI
 RUN   pyenv global  $PYTHON_38_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 # Node 12
diff --git a/ubuntu/standard/3.0/Dockerfile b/ubuntu/standard/3.0/Dockerfile
index 2fd80153..9de2b54c 100644
--- a/ubuntu/standard/3.0/Dockerfile
+++ b/ubuntu/standard/3.0/Dockerfile
@@ -237,13 +237,14 @@ ENV PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
 ENV PYTHON_PIP_VERSION=21.1.2
+ENV PYYAML_VERSION=5.4.1
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
 RUN   pyenv global  $PYTHON_37_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.1.2" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
 
 
@@ -252,7 +253,7 @@ RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSI
 RUN   pyenv global  $PYTHON_38_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.1.2" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
 
 #**************** END PYTHON *****************************************************
diff --git a/ubuntu/standard/4.0/Dockerfile b/ubuntu/standard/4.0/Dockerfile
index 2b68f340..0cc7dd38 100644
--- a/ubuntu/standard/4.0/Dockerfile
+++ b/ubuntu/standard/4.0/Dockerfile
@@ -245,13 +245,14 @@ ENV PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
 ENV PYTHON_PIP_VERSION=21.1.2
+ENV PYYAML_VERSION=5.4.1
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
 RUN   pyenv global  $PYTHON_37_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 
@@ -260,7 +261,7 @@ RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSI
 RUN   pyenv global  $PYTHON_38_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 #**************** END PYTHON *****************************************************
diff --git a/ubuntu/standard/5.0/Dockerfile b/ubuntu/standard/5.0/Dockerfile
index 7a49f82b..df733daf 100644
--- a/ubuntu/standard/5.0/Dockerfile
+++ b/ubuntu/standard/5.0/Dockerfile
@@ -230,13 +230,14 @@ ENV PYTHON_38_VERSION="3.8.10"
 ENV PYTHON_39_VERSION="3.9.2"
 
 ARG PYTHON_PIP_VERSION=21.1.2
+ENV PYYAML_VERSION=5.4.1
 
 COPY tools/runtime_configs/python/$PYTHON_37_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_37_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_37_VERSION; rm -rf /tmp/*
 RUN   pyenv global  $PYTHON_37_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
@@ -244,7 +245,7 @@ RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSI
 RUN   pyenv global  $PYTHON_38_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
@@ -252,7 +253,7 @@ RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSI
 RUN   pyenv global  $PYTHON_39_VERSION
 RUN set -ex \
     && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
-    && pip3 install --no-cache-dir --upgrade "PyYAML==5.3.1" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 #**************** END PYTHON *****************************************************

From a99fe9bcc81b9b60ea0c69e4834ba1cf0dd57111 Mon Sep 17 00:00:00 2001
From: Jakob Keller <57402305+jakob-keller@users.noreply.github.com>
Date: Wed, 26 May 2021 10:32:23 +0200
Subject: [PATCH 5/5] Add or update Python 3.9 runtime version

---
 al2/aarch64/standard/2.0/Dockerfile           | 13 +++++++++++++
 al2/aarch64/standard/2.0/runtimes.yml         |  4 ++++
 .../2.0/tools/runtime_configs/python/3.9.5    | 17 +++++++++++++++++
 al2/x86_64/standard/2.0/Dockerfile            | 11 +++++++++++
 al2/x86_64/standard/2.0/runtimes.yml          |  4 ++++
 .../2.0/tools/runtime_configs/python/3.9.5    | 17 +++++++++++++++++
 al2/x86_64/standard/3.0/Dockerfile            | 11 +++++++++++
 al2/x86_64/standard/3.0/runtimes.yml          |  4 ++++
 .../3.0/tools/runtime_configs/python/3.9.5    | 17 +++++++++++++++++
 ubuntu/standard/3.0/Dockerfile                | 12 +++++++++++-
 ubuntu/standard/3.0/runtimes.yml              |  4 ++++
 .../3.0/tools/runtime_configs/python/3.9.5    | 17 +++++++++++++++++
 ubuntu/standard/4.0/Dockerfile                | 12 +++++++++++-
 ubuntu/standard/4.0/runtimes.yml              |  4 ++++
 .../4.0/tools/runtime_configs/python/3.9.5    | 17 +++++++++++++++++
 ubuntu/standard/5.0/Dockerfile                |  2 +-
 .../5.0/tools/runtime_configs/python/3.9.2    | 19 -------------------
 .../5.0/tools/runtime_configs/python/3.9.5    | 17 +++++++++++++++++
 18 files changed, 180 insertions(+), 22 deletions(-)
 create mode 100644 al2/aarch64/standard/2.0/tools/runtime_configs/python/3.9.5
 create mode 100644 al2/x86_64/standard/2.0/tools/runtime_configs/python/3.9.5
 create mode 100644 al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.5
 create mode 100644 ubuntu/standard/3.0/tools/runtime_configs/python/3.9.5
 create mode 100644 ubuntu/standard/4.0/tools/runtime_configs/python/3.9.5
 delete mode 100644 ubuntu/standard/5.0/tools/runtime_configs/python/3.9.2
 create mode 100644 ubuntu/standard/5.0/tools/runtime_configs/python/3.9.5

diff --git a/al2/aarch64/standard/2.0/Dockerfile b/al2/aarch64/standard/2.0/Dockerfile
index f239045f..e9e1ea3a 100644
--- a/al2/aarch64/standard/2.0/Dockerfile
+++ b/al2/aarch64/standard/2.0/Dockerfile
@@ -347,6 +347,19 @@ RUN set -ex \
     && wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
     && chmod +x /usr/local/bin/dind
 
+#Python 3.9
+ENV PYTHON_39_VERSION="3.9.5"
+
+COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
+RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSION; rm -rf /tmp/*
+RUN   pyenv global  $PYTHON_39_VERSION
+RUN set -ex \
+    && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
+    && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv \
+    && pip3 install --no-cache-dir "docker-compose==$DOCKER_COMPOSE_VERSION" \
+    && docker-compose version
+
 #Python 3.8
 ENV PYTHON_38_VERSION="3.8.10"
 
diff --git a/al2/aarch64/standard/2.0/runtimes.yml b/al2/aarch64/standard/2.0/runtimes.yml
index f9cd6e61..f3f78b4a 100644
--- a/al2/aarch64/standard/2.0/runtimes.yml
+++ b/al2/aarch64/standard/2.0/runtimes.yml
@@ -58,6 +58,10 @@ runtimes:
           - echo "Installing Go version 1.14 ..."
   python:
     versions:
+      3.9:
+        commands:
+          - echo "Installing Python version 3.9 ..."
+          - pyenv global  $PYTHON_39_VERSION
       3.8:
         commands:
           - echo "Installing Python version 3.8 ..."
diff --git a/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.9.5 b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.9.5
new file mode 100644
index 00000000..d7527a70
--- /dev/null
+++ b/al2/aarch64/standard/2.0/tools/runtime_configs/python/3.9.5
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.5
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz#0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" standard verify_py39 copy_python_gdb ensurepip
+else
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz#e0fbd5b6e1ee242524430dee3c91baf4cbbaba4a72dd1674b90fda87b713c7ab" standard verify_py39 copy_python_gdb ensurepip
+fi
diff --git a/al2/x86_64/standard/2.0/Dockerfile b/al2/x86_64/standard/2.0/Dockerfile
index b06fd622..299c5e2b 100644
--- a/al2/x86_64/standard/2.0/Dockerfile
+++ b/al2/x86_64/standard/2.0/Dockerfile
@@ -394,6 +394,17 @@ RUN set -ex \
     && chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \
     && docker-compose version
 
+#Python 3.9
+ENV PYTHON_39_VERSION="3.9.5"
+
+COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
+RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSION; rm -rf /tmp/*
+RUN   pyenv global  $PYTHON_39_VERSION
+RUN set -ex \
+    && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
+    && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
+
 #Python 3.8
 ENV PYTHON_38_VERSION="3.8.10"
 
diff --git a/al2/x86_64/standard/2.0/runtimes.yml b/al2/x86_64/standard/2.0/runtimes.yml
index f70ef430..4054b823 100644
--- a/al2/x86_64/standard/2.0/runtimes.yml
+++ b/al2/x86_64/standard/2.0/runtimes.yml
@@ -69,6 +69,10 @@ runtimes:
         commands:
           - echo "Installing Python version 3.8 ..."
           - pyenv global  $PYTHON_38_VERSION
+      3.9:
+        commands:
+          - echo "Installing Python version 3.9 ..."
+          - pyenv global  $PYTHON_39_VERSION
   php:
     versions:
       7.3:
diff --git a/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.9.5 b/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.9.5
new file mode 100644
index 00000000..d7527a70
--- /dev/null
+++ b/al2/x86_64/standard/2.0/tools/runtime_configs/python/3.9.5
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.5
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz#0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" standard verify_py39 copy_python_gdb ensurepip
+else
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz#e0fbd5b6e1ee242524430dee3c91baf4cbbaba4a72dd1674b90fda87b713c7ab" standard verify_py39 copy_python_gdb ensurepip
+fi
diff --git a/al2/x86_64/standard/3.0/Dockerfile b/al2/x86_64/standard/3.0/Dockerfile
index 7816086e..41b20b06 100644
--- a/al2/x86_64/standard/3.0/Dockerfile
+++ b/al2/x86_64/standard/3.0/Dockerfile
@@ -387,6 +387,17 @@ RUN set -ex \
     && chmod +x /usr/local/bin/dind /usr/local/bin/docker-compose \
     && docker-compose version
 
+#Python 3.9
+ENV PYTHON_39_VERSION="3.9.5"
+
+COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
+RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSION; rm -rf /tmp/*
+RUN   pyenv global  $PYTHON_39_VERSION
+RUN set -ex \
+    && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
+    && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
+
 #Python 3.8
 ENV PYTHON_38_VERSION="3.8.10"
 
diff --git a/al2/x86_64/standard/3.0/runtimes.yml b/al2/x86_64/standard/3.0/runtimes.yml
index 19f6c0b7..6357b3c8 100644
--- a/al2/x86_64/standard/3.0/runtimes.yml
+++ b/al2/x86_64/standard/3.0/runtimes.yml
@@ -69,6 +69,10 @@ runtimes:
           - goenv global  $GOLANG_14_VERSION
   python:
     versions:
+      3.9:
+        commands:
+          - echo "Installing Python version 3.9 ..."
+          - pyenv global  $PYTHON_39_VERSION
       3.8:
         commands:
           - echo "Installing Python version 3.8 ..."
diff --git a/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.5 b/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.5
new file mode 100644
index 00000000..d7527a70
--- /dev/null
+++ b/al2/x86_64/standard/3.0/tools/runtime_configs/python/3.9.5
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.5
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz#0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" standard verify_py39 copy_python_gdb ensurepip
+else
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz#e0fbd5b6e1ee242524430dee3c91baf4cbbaba4a72dd1674b90fda87b713c7ab" standard verify_py39 copy_python_gdb ensurepip
+fi
diff --git a/ubuntu/standard/3.0/Dockerfile b/ubuntu/standard/3.0/Dockerfile
index 9de2b54c..d3205fa9 100644
--- a/ubuntu/standard/3.0/Dockerfile
+++ b/ubuntu/standard/3.0/Dockerfile
@@ -233,7 +233,8 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 #**************** END RUBY *****************************************************
 
 #**************** PYTHON *****************************************************
-ENV PYTHON_38_VERSION="3.8.10" \
+ENV PYTHON_39_VERSION="3.9.5" \
+    PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
 ENV PYTHON_PIP_VERSION=21.1.2
@@ -248,6 +249,15 @@ RUN set -ex \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
 
 
+COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
+RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSION; rm -rf /tmp/*
+RUN   pyenv global  $PYTHON_39_VERSION
+RUN set -ex \
+    && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
+    && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv
+
+
 COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION; rm -rf /tmp/*
 RUN   pyenv global  $PYTHON_38_VERSION
diff --git a/ubuntu/standard/3.0/runtimes.yml b/ubuntu/standard/3.0/runtimes.yml
index 11831057..10cc76b8 100644
--- a/ubuntu/standard/3.0/runtimes.yml
+++ b/ubuntu/standard/3.0/runtimes.yml
@@ -70,6 +70,10 @@ runtimes:
         commands:
           - echo "Installing Python version 3.8 ..."
           - pyenv global  $PYTHON_38_VERSION
+      3.9:
+        commands:
+          - echo "Installing Python version 3.9 ..."
+          - pyenv global  $PYTHON_39_VERSION
   php:
     versions:
       7.3:
diff --git a/ubuntu/standard/3.0/tools/runtime_configs/python/3.9.5 b/ubuntu/standard/3.0/tools/runtime_configs/python/3.9.5
new file mode 100644
index 00000000..d7527a70
--- /dev/null
+++ b/ubuntu/standard/3.0/tools/runtime_configs/python/3.9.5
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.5
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz#0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" standard verify_py39 copy_python_gdb ensurepip
+else
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz#e0fbd5b6e1ee242524430dee3c91baf4cbbaba4a72dd1674b90fda87b713c7ab" standard verify_py39 copy_python_gdb ensurepip
+fi
diff --git a/ubuntu/standard/4.0/Dockerfile b/ubuntu/standard/4.0/Dockerfile
index 0cc7dd38..9777afad 100644
--- a/ubuntu/standard/4.0/Dockerfile
+++ b/ubuntu/standard/4.0/Dockerfile
@@ -241,7 +241,8 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 #**************** END RUBY *****************************************************
 
 #**************** PYTHON *****************************************************
-ENV PYTHON_38_VERSION="3.8.10" \
+ENV PYTHON_39_VERSION="3.9.5" \
+    PYTHON_38_VERSION="3.8.10" \
     PYTHON_37_VERSION="3.7.10"
 
 ENV PYTHON_PIP_VERSION=21.1.2
@@ -256,6 +257,15 @@ RUN set -ex \
     && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
 
 
+COPY tools/runtime_configs/python/$PYTHON_39_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_39_VERSION
+RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_39_VERSION; rm -rf /tmp/*
+RUN   pyenv global  $PYTHON_39_VERSION
+RUN set -ex \
+    && pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
+    && pip3 install --no-cache-dir --upgrade "PyYAML==$PYYAML_VERSION" \
+    && pip3 install --no-cache-dir --upgrade setuptools wheel aws-sam-cli awscli boto3 pipenv virtualenv --use-feature=2020-resolver
+
+
 COPY tools/runtime_configs/python/$PYTHON_38_VERSION /root/.pyenv/plugins/python-build/share/python-build/$PYTHON_38_VERSION
 RUN   env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_38_VERSION; rm -rf /tmp/*
 RUN   pyenv global  $PYTHON_38_VERSION
diff --git a/ubuntu/standard/4.0/runtimes.yml b/ubuntu/standard/4.0/runtimes.yml
index 7a68a21d..08dfc5b2 100644
--- a/ubuntu/standard/4.0/runtimes.yml
+++ b/ubuntu/standard/4.0/runtimes.yml
@@ -70,6 +70,10 @@ runtimes:
           - goenv global  $GOLANG_14_VERSION
   python:
     versions:
+      3.9:
+        commands:
+          - echo "Installing Python version 3.9 ..."
+          - pyenv global  $PYTHON_39_VERSION
       3.8:
         commands:
           - echo "Installing Python version 3.8 ..."
diff --git a/ubuntu/standard/4.0/tools/runtime_configs/python/3.9.5 b/ubuntu/standard/4.0/tools/runtime_configs/python/3.9.5
new file mode 100644
index 00000000..d7527a70
--- /dev/null
+++ b/ubuntu/standard/4.0/tools/runtime_configs/python/3.9.5
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.5
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz#0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" standard verify_py39 copy_python_gdb ensurepip
+else
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz#e0fbd5b6e1ee242524430dee3c91baf4cbbaba4a72dd1674b90fda87b713c7ab" standard verify_py39 copy_python_gdb ensurepip
+fi
diff --git a/ubuntu/standard/5.0/Dockerfile b/ubuntu/standard/5.0/Dockerfile
index df733daf..a08375c4 100644
--- a/ubuntu/standard/5.0/Dockerfile
+++ b/ubuntu/standard/5.0/Dockerfile
@@ -227,7 +227,7 @@ RUN rbenv install $RUBY_27_VERSION; rm -rf /tmp/*; rbenv global $RUBY_27_VERSION
 #**************** PYTHON *****************************************************
 ENV PYTHON_37_VERSION="3.7.10"
 ENV PYTHON_38_VERSION="3.8.10"
-ENV PYTHON_39_VERSION="3.9.2"
+ENV PYTHON_39_VERSION="3.9.5"
 
 ARG PYTHON_PIP_VERSION=21.1.2
 ENV PYYAML_VERSION=5.4.1
diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.2 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.2
deleted file mode 100644
index 9d44c517..00000000
--- a/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.2
+++ /dev/null
@@ -1,19 +0,0 @@
-export PYTHON_CONFIGURE_OPTS="\
-            --enable-shared
-            --enable-loadable-sqlite-extensions"  
-
-# Don't change below this line.
-# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.2
-
-#require_gcc
-prefer_openssl11
-export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
-install_package "openssl-1.1.1i" "https://www.openssl.org/source/old/1.1.1/openssl-1.1.1i.tar.gz#e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" mac_openssl --if has_broken_mac_openssl
-install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
-if has_tar_xz_support; then
-    install_package "Python-3.9.2" "https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tar.xz#3c2034c54f811448f516668dce09d24008a0716c3a794dd8639b5388cbde247d" standard verify_py39 copy_python_gdb ensurepip
-else
-    install_package "Python-3.9.2" "https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tgz#7899e8a6f7946748830d66739f2d8f2b30214dad956e56b9ba216b3de5581519" standard verify_py39 copy_python_gdb ensurepip
-fi
-
-
diff --git a/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.5 b/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.5
new file mode 100644
index 00000000..d7527a70
--- /dev/null
+++ b/ubuntu/standard/5.0/tools/runtime_configs/python/3.9.5
@@ -0,0 +1,17 @@
+export PYTHON_CONFIGURE_OPTS="\
+            --enable-shared
+            --enable-loadable-sqlite-extensions"
+
+# Don't change below this line.
+# https://github.com/pyenv/pyenv/blob/master/plugins/python-build/share/python-build/3.9.5
+
+#require_gcc
+prefer_openssl11
+export PYTHON_BUILD_CONFIGURE_WITH_OPENSSL=1
+install_package "openssl-1.1.1k" "https://www.openssl.org/source/openssl-1.1.1k.tar.gz#892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5" mac_openssl --if has_broken_mac_openssl
+install_package "readline-8.0" "https://ftpmirror.gnu.org/readline/readline-8.0.tar.gz#e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461" mac_readline --if has_broken_mac_readline
+if has_tar_xz_support; then
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tar.xz#0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" standard verify_py39 copy_python_gdb ensurepip
+else
+    install_package "Python-3.9.5" "https://www.python.org/ftp/python/3.9.5/Python-3.9.5.tgz#e0fbd5b6e1ee242524430dee3c91baf4cbbaba4a72dd1674b90fda87b713c7ab" standard verify_py39 copy_python_gdb ensurepip
+fi