Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update python #12220

Merged
merged 1 commit into from
Apr 13, 2022
Merged

Update python #12220

merged 1 commit into from
Apr 13, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Apr 11, 2022

Changes:

Changes:

- docker-library/python@0b9aee9: Removing LANG env var (docker-library/python#570)
- docker-library/python@d298086: Merge pull request docker-library/python#716 from edmorley/remove-with-system-ffi
- docker-library/python@028012a: Remove redundant `--with-system-ffi` configure option
- docker-library/python@1999778: Restore /usr/local/bin/python as a relative symlink to /usr/local/bin/python3, rather than an absolute one (docker-library/python#714)
@github-actions
Copy link

Diff for fb83944:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3c9bcee..72b396e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,95 +3,95 @@ GitRepo: https://github.com/docker-library/python.git
 
 Tags: 3.7.13-alpine3.14, 3.7-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.7/alpine3.14
 
 Tags: 3.7.13-alpine3.15, 3.7-alpine3.15, 3.7.13-alpine, 3.7-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.7/alpine3.15
 
 Tags: 3.7.13-bullseye, 3.7-bullseye
 SharedTags: 3.7.13, 3.7
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.7/bullseye
 
 Tags: 3.7.13-buster, 3.7-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.7/buster
 
 Tags: 3.7.13-slim-bullseye, 3.7-slim-bullseye, 3.7.13-slim, 3.7-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.7/slim-bullseye
 
 Tags: 3.7.13-slim-buster, 3.7-slim-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.7/slim-buster
 
 Tags: 3.8.13-alpine3.14, 3.8-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.8/alpine3.14
 
 Tags: 3.8.13-alpine3.15, 3.8-alpine3.15, 3.8.13-alpine, 3.8-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.8/alpine3.15
 
 Tags: 3.8.13-bullseye, 3.8-bullseye
 SharedTags: 3.8.13, 3.8
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.8/bullseye
 
 Tags: 3.8.13-buster, 3.8-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.8/buster
 
 Tags: 3.8.13-slim-bullseye, 3.8-slim-bullseye, 3.8.13-slim, 3.8-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.8/slim-bullseye
 
 Tags: 3.8.13-slim-buster, 3.8-slim-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.8/slim-buster
 
 Tags: 3.9.12-alpine3.14, 3.9-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.9/alpine3.14
 
 Tags: 3.9.12-alpine3.15, 3.9-alpine3.15, 3.9.12-alpine, 3.9-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.9/alpine3.15
 
 Tags: 3.9.12-bullseye, 3.9-bullseye
 SharedTags: 3.9.12, 3.9
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.9/bullseye
 
 Tags: 3.9.12-buster, 3.9-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.9/buster
 
 Tags: 3.9.12-slim-bullseye, 3.9-slim-bullseye, 3.9.12-slim, 3.9-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.9/slim-bullseye
 
 Tags: 3.9.12-slim-buster, 3.9-slim-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.9/slim-buster
 
 Tags: 3.9.12-windowsservercore-1809, 3.9-windowsservercore-1809
@@ -110,33 +110,33 @@ Constraints: windowsservercore-ltsc2022
 
 Tags: 3.10.4-alpine3.14, 3.10-alpine3.14, 3-alpine3.14, alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.10/alpine3.14
 
 Tags: 3.10.4-alpine3.15, 3.10-alpine3.15, 3-alpine3.15, alpine3.15, 3.10.4-alpine, 3.10-alpine, 3-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.10/alpine3.15
 
 Tags: 3.10.4-bullseye, 3.10-bullseye, 3-bullseye, bullseye
 SharedTags: 3.10.4, 3.10, 3, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.10/bullseye
 
 Tags: 3.10.4-buster, 3.10-buster, 3-buster, buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.10/buster
 
 Tags: 3.10.4-slim-bullseye, 3.10-slim-bullseye, 3-slim-bullseye, slim-bullseye, 3.10.4-slim, 3.10-slim, 3-slim, slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.10/slim-bullseye
 
 Tags: 3.10.4-slim-buster, 3.10-slim-buster, 3-slim-buster, slim-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 0a9ee3e64588bb1144d6e4e413a0c5dd5cd48651
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.10/slim-buster
 
 Tags: 3.10.4-windowsservercore-1809, 3.10-windowsservercore-1809, 3-windowsservercore-1809, windowsservercore-1809
@@ -155,33 +155,33 @@ Constraints: windowsservercore-ltsc2022
 
 Tags: 3.11.0a7-alpine3.14, 3.11-rc-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 37e4721d30f5f6111015aa21061ec2961040fe8f
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.11-rc/alpine3.14
 
 Tags: 3.11.0a7-alpine3.15, 3.11-rc-alpine3.15, 3.11.0a7-alpine, 3.11-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 37e4721d30f5f6111015aa21061ec2961040fe8f
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.11-rc/alpine3.15
 
 Tags: 3.11.0a7-bullseye, 3.11-rc-bullseye
 SharedTags: 3.11.0a7, 3.11-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 37e4721d30f5f6111015aa21061ec2961040fe8f
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.11-rc/bullseye
 
 Tags: 3.11.0a7-buster, 3.11-rc-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 37e4721d30f5f6111015aa21061ec2961040fe8f
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.11-rc/buster
 
 Tags: 3.11.0a7-slim-bullseye, 3.11-rc-slim-bullseye, 3.11.0a7-slim, 3.11-rc-slim
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 37e4721d30f5f6111015aa21061ec2961040fe8f
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.11-rc/slim-bullseye
 
 Tags: 3.11.0a7-slim-buster, 3.11-rc-slim-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 37e4721d30f5f6111015aa21061ec2961040fe8f
+GitCommit: 0b9aee903589af7182db9dfc8cb1f5203332a92f
 Directory: 3.11-rc/slim-buster
 
 Tags: 3.11.0a7-windowsservercore-1809, 3.11-rc-windowsservercore-1809
diff --git a/python_3.11-rc-alpine/Dockerfile b/python_3.11-rc-alpine/Dockerfile
index 7864e3d..e63a8a0 100644
--- a/python_3.11-rc-alpine/Dockerfile
+++ b/python_3.11-rc-alpine/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.15
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -77,7 +73,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.11-rc-alpine3.14/Dockerfile b/python_3.11-rc-alpine3.14/Dockerfile
index 5a532dc..701ae2b 100644
--- a/python_3.11-rc-alpine3.14/Dockerfile
+++ b/python_3.11-rc-alpine3.14/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.14
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -77,7 +73,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.11-rc-bullseye/Dockerfile b/python_3.11-rc-bullseye/Dockerfile
index dd13e2c..2016d04 100644
--- a/python_3.11-rc-bullseye/Dockerfile
+++ b/python_3.11-rc-bullseye/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:bullseye
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -49,7 +45,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -83,7 +78,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.11-rc-buster/Dockerfile b/python_3.11-rc-buster/Dockerfile
index 9d4cd2f..d1857b3 100644
--- a/python_3.11-rc-buster/Dockerfile
+++ b/python_3.11-rc-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:buster
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -49,7 +45,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -83,7 +78,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.11-rc-slim-buster/Dockerfile b/python_3.11-rc-slim-buster/Dockerfile
index 86ed9ae..2bd5870 100644
--- a/python_3.11-rc-slim-buster/Dockerfile
+++ b/python_3.11-rc-slim-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:buster-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -74,7 +70,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -116,7 +111,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.11-rc-slim/Dockerfile b/python_3.11-rc-slim/Dockerfile
index 08e6553..071f552 100644
--- a/python_3.11-rc-slim/Dockerfile
+++ b/python_3.11-rc-slim/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:bullseye-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -74,7 +70,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -116,7 +111,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.7-alpine/Dockerfile b/python_3.7-alpine/Dockerfile
index bf4dbdf..a5c4317 100644
--- a/python_3.7-alpine/Dockerfile
+++ b/python_3.7-alpine/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.15
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -76,7 +72,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -151,7 +146,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.7-alpine3.14/Dockerfile b/python_3.7-alpine3.14/Dockerfile
index 19d78a7..3928f5d 100644
--- a/python_3.7-alpine3.14/Dockerfile
+++ b/python_3.7-alpine3.14/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.14
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -76,7 +72,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -151,7 +146,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.7-bullseye/Dockerfile b/python_3.7-bullseye/Dockerfile
index 023aa72..99c3d92 100644
--- a/python_3.7-bullseye/Dockerfile
+++ b/python_3.7-bullseye/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:bullseye
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -48,7 +44,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -119,7 +114,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.7-buster/Dockerfile b/python_3.7-buster/Dockerfile
index 486ac3e..1d9009a 100644
--- a/python_3.7-buster/Dockerfile
+++ b/python_3.7-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:buster
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -48,7 +44,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -119,7 +114,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.7-slim-buster/Dockerfile b/python_3.7-slim-buster/Dockerfile
index 1cc6b46..840b07c 100644
--- a/python_3.7-slim-buster/Dockerfile
+++ b/python_3.7-slim-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:buster-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -73,7 +69,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -152,7 +147,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.7-slim/Dockerfile b/python_3.7-slim/Dockerfile
index cc1e59c..d9f1ed3 100644
--- a/python_3.7-slim/Dockerfile
+++ b/python_3.7-slim/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:bullseye-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -73,7 +69,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -152,7 +147,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.8-alpine/Dockerfile b/python_3.8-alpine/Dockerfile
index 18fae47..7f1fdc1 100644
--- a/python_3.8-alpine/Dockerfile
+++ b/python_3.8-alpine/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.15
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -76,7 +72,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.8-alpine3.14/Dockerfile b/python_3.8-alpine3.14/Dockerfile
index c5a58f5..8cd0e1e 100644
--- a/python_3.8-alpine3.14/Dockerfile
+++ b/python_3.8-alpine3.14/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.14
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -76,7 +72,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.8-bullseye/Dockerfile b/python_3.8-bullseye/Dockerfile
index 6f39915..91de2e4 100644
--- a/python_3.8-bullseye/Dockerfile
+++ b/python_3.8-bullseye/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:bullseye
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -48,7 +44,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -83,7 +78,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.8-buster/Dockerfile b/python_3.8-buster/Dockerfile
index af2c2af..d27955a 100644
--- a/python_3.8-buster/Dockerfile
+++ b/python_3.8-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:buster
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -48,7 +44,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -83,7 +78,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.8-slim-buster/Dockerfile b/python_3.8-slim-buster/Dockerfile
index 39f8faa..add71d5 100644
--- a/python_3.8-slim-buster/Dockerfile
+++ b/python_3.8-slim-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:buster-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -73,7 +69,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -116,7 +111,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.8-slim/Dockerfile b/python_3.8-slim/Dockerfile
index 807d215..beba07e 100644
--- a/python_3.8-slim/Dockerfile
+++ b/python_3.8-slim/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:bullseye-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -73,7 +69,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -116,7 +111,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.9-alpine/Dockerfile b/python_3.9-alpine/Dockerfile
index 5964140..28322ad 100644
--- a/python_3.9-alpine/Dockerfile
+++ b/python_3.9-alpine/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.15
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -76,7 +72,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -114,7 +109,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.9-alpine3.14/Dockerfile b/python_3.9-alpine3.14/Dockerfile
index 1697d9c..d989c73 100644
--- a/python_3.9-alpine3.14/Dockerfile
+++ b/python_3.9-alpine3.14/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.14
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -76,7 +72,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -114,7 +109,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.9-bullseye/Dockerfile b/python_3.9-bullseye/Dockerfile
index bf2dcaa..7f43112 100644
--- a/python_3.9-bullseye/Dockerfile
+++ b/python_3.9-bullseye/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:bullseye
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -48,7 +44,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -82,7 +77,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.9-buster/Dockerfile b/python_3.9-buster/Dockerfile
index efac286..477a484 100644
--- a/python_3.9-buster/Dockerfile
+++ b/python_3.9-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:buster
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -48,7 +44,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -82,7 +77,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.9-slim-buster/Dockerfile b/python_3.9-slim-buster/Dockerfile
index d364750..b758ace 100644
--- a/python_3.9-slim-buster/Dockerfile
+++ b/python_3.9-slim-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:buster-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -73,7 +69,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_3.9-slim/Dockerfile b/python_3.9-slim/Dockerfile
index 941e742..b1b4045 100644
--- a/python_3.9-slim/Dockerfile
+++ b/python_3.9-slim/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:bullseye-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -73,7 +69,6 @@ RUN set -eux; \
 		--enable-option-checking=fatal \
 		--enable-shared \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_alpine/Dockerfile b/python_alpine/Dockerfile
index b9c4aa9..299b1e5 100644
--- a/python_alpine/Dockerfile
+++ b/python_alpine/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.15
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -77,7 +73,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_alpine3.14/Dockerfile b/python_alpine3.14/Dockerfile
index bb956ed..6cfe506 100644
--- a/python_alpine3.14/Dockerfile
+++ b/python_alpine3.14/Dockerfile
@@ -9,10 +9,6 @@ FROM alpine:3.14
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apk add --no-cache \
@@ -77,7 +73,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -115,7 +110,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_bullseye/Dockerfile b/python_bullseye/Dockerfile
index 70d4e0b..aa76b43 100644
--- a/python_bullseye/Dockerfile
+++ b/python_bullseye/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:bullseye
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -49,7 +45,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -83,7 +78,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_buster/Dockerfile b/python_buster/Dockerfile
index 8994085..d402d8b 100644
--- a/python_buster/Dockerfile
+++ b/python_buster/Dockerfile
@@ -9,10 +9,6 @@ FROM buildpack-deps:buster
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -49,7 +45,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -83,7 +78,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_slim-buster/Dockerfile b/python_slim-buster/Dockerfile
index 6aba626..1f5dc32 100644
--- a/python_slim-buster/Dockerfile
+++ b/python_slim-buster/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:buster-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -74,7 +70,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -116,7 +111,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
diff --git a/python_slim/Dockerfile b/python_slim/Dockerfile
index 94f2196..5fa60f1 100644
--- a/python_slim/Dockerfile
+++ b/python_slim/Dockerfile
@@ -9,10 +9,6 @@ FROM debian:bullseye-slim
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
 
-# http://bugs.python.org/issue19846
-# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
-ENV LANG C.UTF-8
-
 # runtime dependencies
 RUN set -eux; \
 	apt-get update; \
@@ -74,7 +70,6 @@ RUN set -eux; \
 		--enable-shared \
 		--with-lto \
 		--with-system-expat \
-		--with-system-ffi \
 		--without-ensurepip \
 	; \
 	nproc="$(nproc)"; \
@@ -116,7 +111,7 @@ RUN set -eux; \
 		dst="$(echo "$src" | tr -d 3)"; \
 		[ -s "/usr/local/bin/$src" ]; \
 		[ ! -e "/usr/local/bin/$dst" ]; \
-		ln -svT "/usr/local/bin/$src" "/usr/local/bin/$dst"; \
+		ln -svT "$src" "/usr/local/bin/$dst"; \
 	done
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"

Relevant Maintainers:

@yosifkit yosifkit merged commit 39a1eaf into docker-library:master Apr 13, 2022
@yosifkit yosifkit deleted the python branch April 13, 2022 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants