docker-library · tianon · Aug 29, 2024 · Aug 23, 2024 · edmorley · Aug 24, 2024
diff --git a/3.10/alpine3.19/Dockerfile b/3.10/alpine3.19/Dockerfile
diff --git a/3.10/alpine3.20/Dockerfile b/3.10/alpine3.20/Dockerfile
diff --git a/3.10/bookworm/Dockerfile b/3.10/bookworm/Dockerfile
diff --git a/3.10/bullseye/Dockerfile b/3.10/bullseye/Dockerfile
diff --git a/3.10/slim-bookworm/Dockerfile b/3.10/slim-bookworm/Dockerfile
diff --git a/3.10/slim-bullseye/Dockerfile b/3.10/slim-bullseye/Dockerfile
diff --git a/3.11/alpine3.19/Dockerfile b/3.11/alpine3.19/Dockerfile
diff --git a/3.11/alpine3.20/Dockerfile b/3.11/alpine3.20/Dockerfile
diff --git a/3.11/bookworm/Dockerfile b/3.11/bookworm/Dockerfile
diff --git a/3.11/bullseye/Dockerfile b/3.11/bullseye/Dockerfile
diff --git a/3.11/slim-bookworm/Dockerfile b/3.11/slim-bookworm/Dockerfile
diff --git a/3.11/slim-bullseye/Dockerfile b/3.11/slim-bullseye/Dockerfile
diff --git a/3.11/windows/windowsservercore-1809/Dockerfile b/3.11/windows/windowsservercore-1809/Dockerfile
diff --git a/3.11/windows/windowsservercore-ltsc2022/Dockerfile b/3.11/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/3.12/alpine3.19/Dockerfile b/3.12/alpine3.19/Dockerfile
diff --git a/3.12/alpine3.20/Dockerfile b/3.12/alpine3.20/Dockerfile
diff --git a/3.12/bookworm/Dockerfile b/3.12/bookworm/Dockerfile
diff --git a/3.12/bullseye/Dockerfile b/3.12/bullseye/Dockerfile
diff --git a/3.12/slim-bookworm/Dockerfile b/3.12/slim-bookworm/Dockerfile
diff --git a/3.12/slim-bullseye/Dockerfile b/3.12/slim-bullseye/Dockerfile
diff --git a/3.12/windows/windowsservercore-1809/Dockerfile b/3.12/windows/windowsservercore-1809/Dockerfile
diff --git a/3.12/windows/windowsservercore-ltsc2022/Dockerfile b/3.12/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/3.13-rc/alpine3.19/Dockerfile b/3.13-rc/alpine3.19/Dockerfile
diff --git a/3.13-rc/alpine3.20/Dockerfile b/3.13-rc/alpine3.20/Dockerfile
diff --git a/3.13-rc/bookworm/Dockerfile b/3.13-rc/bookworm/Dockerfile
diff --git a/3.13-rc/bullseye/Dockerfile b/3.13-rc/bullseye/Dockerfile
diff --git a/3.13-rc/slim-bookworm/Dockerfile b/3.13-rc/slim-bookworm/Dockerfile
diff --git a/3.13-rc/slim-bullseye/Dockerfile b/3.13-rc/slim-bullseye/Dockerfile
diff --git a/3.13-rc/windows/windowsservercore-1809/Dockerfile b/3.13-rc/windows/windowsservercore-1809/Dockerfile
diff --git a/3.13-rc/windows/windowsservercore-ltsc2022/Dockerfile b/3.13-rc/windows/windowsservercore-ltsc2022/Dockerfile
diff --git a/3.8/alpine3.19/Dockerfile b/3.8/alpine3.19/Dockerfile
diff --git a/3.8/alpine3.20/Dockerfile b/3.8/alpine3.20/Dockerfile
diff --git a/3.8/bookworm/Dockerfile b/3.8/bookworm/Dockerfile
diff --git a/3.8/bullseye/Dockerfile b/3.8/bullseye/Dockerfile
diff --git a/3.8/slim-bookworm/Dockerfile b/3.8/slim-bookworm/Dockerfile
diff --git a/3.8/slim-bullseye/Dockerfile b/3.8/slim-bullseye/Dockerfile
diff --git a/3.9/alpine3.19/Dockerfile b/3.9/alpine3.19/Dockerfile
diff --git a/3.9/alpine3.20/Dockerfile b/3.9/alpine3.20/Dockerfile
diff --git a/3.9/bookworm/Dockerfile b/3.9/bookworm/Dockerfile
diff --git a/3.9/bullseye/Dockerfile b/3.9/bullseye/Dockerfile
diff --git a/3.9/slim-bookworm/Dockerfile b/3.9/slim-bookworm/Dockerfile
diff --git a/3.9/slim-bullseye/Dockerfile b/3.9/slim-bullseye/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
 {{ if .setuptools then ( -}} 
 		('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ 
 {{ ) else "" end -}} 
 	; \ 
 	Remove-Item get-pip.py -Force; \ 
 	\ 
 	Write-Host 'Verifying pip install ...'; \ 
 	pip --version; \ 
 {{ if .setuptools then ( -}} 
 		('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ 
 {{ ) else "" end -}} 
 	; \ 
 	Remove-Item get-pip.py -Force; \ 
 	\ 
 	Write-Host 'Verifying pip install ...'; \ 
 	pip --version; \ 
@@ -307,7 +307,12 @@ RUN set -eux; \
 		"pip==$PYTHON_PIP_VERSION" \
 {{ if .setuptools then ( -}}
 		"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
-		"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
+		"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
+		wheel \
-		"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
+		"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
+		wheel \
-{{ ) else "" end -}}
+		# get-pip.py installs wheel by default, adding in case get-pip defaults change
+		wheel \
+{{ ) else ( -}}
+		--no-setuptools \
+		--no-wheel \
+{{ ) end -}}
 	; \
 	rm -f get-pip.py; \
 	\

diff --git a/Dockerfile-windows.template b/Dockerfile-windows.template
@@ -73,7 +73,12 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
 		('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
 {{ if .setuptools then ( -}}
 		('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \
-{{ ) else "" end -}}
+		# get-pip.py installs wheel by default, adding in case get-pip defaults change
+		wheel \
+{{ ) else ( -}}
+		--no-setuptools \
+		--no-wheel \
+{{ ) end -}}
 	; \
 	Remove-Item get-pip.py -Force; \
 	\