docker-library · Aug 24, 2024
diff --git a/‎3.10/alpine3.19/Dockerfile
+4-1 b/‎3.10/alpine3.19/Dockerfile
+4-1
diff --git a/‎3.10/alpine3.20/Dockerfile
+4-1 b/‎3.10/alpine3.20/Dockerfile
+4-1
diff --git a/‎3.10/bookworm/Dockerfile
+4-1 b/‎3.10/bookworm/Dockerfile
+4-1
diff --git a/‎3.10/bullseye/Dockerfile
+4-1 b/‎3.10/bullseye/Dockerfile
+4-1
diff --git a/‎3.10/slim-bookworm/Dockerfile
+4-1 b/‎3.10/slim-bookworm/Dockerfile
+4-1
diff --git a/‎3.10/slim-bullseye/Dockerfile
+4-1 b/‎3.10/slim-bullseye/Dockerfile
+4-1
diff --git a/‎3.11/alpine3.19/Dockerfile
+4-1 b/‎3.11/alpine3.19/Dockerfile
+4-1
diff --git a/‎3.11/alpine3.20/Dockerfile
+4-1 b/‎3.11/alpine3.20/Dockerfile
+4-1
diff --git a/‎3.11/bookworm/Dockerfile
+4-1 b/‎3.11/bookworm/Dockerfile
+4-1
diff --git a/‎3.11/bullseye/Dockerfile
+4-1 b/‎3.11/bullseye/Dockerfile
+4-1
diff --git a/‎3.11/slim-bookworm/Dockerfile
+4-1 b/‎3.11/slim-bookworm/Dockerfile
+4-1
diff --git a/‎3.11/slim-bullseye/Dockerfile
+4-1 b/‎3.11/slim-bullseye/Dockerfile
+4-1
diff --git a/‎3.12/alpine3.19/Dockerfile
+7-1 b/‎3.12/alpine3.19/Dockerfile
+7-1
diff --git a/‎3.12/alpine3.20/Dockerfile
+7-1 b/‎3.12/alpine3.20/Dockerfile
+7-1
diff --git a/‎3.12/bookworm/Dockerfile
+7-1 b/‎3.12/bookworm/Dockerfile
+7-1
diff --git a/‎3.12/bullseye/Dockerfile
+7-1 b/‎3.12/bullseye/Dockerfile
+7-1
diff --git a/‎3.12/slim-bookworm/Dockerfile
+7-1 b/‎3.12/slim-bookworm/Dockerfile
+7-1
diff --git a/‎3.12/slim-bullseye/Dockerfile
+7-1 b/‎3.12/slim-bullseye/Dockerfile
+7-1
diff --git a/‎3.13-rc/alpine3.19/Dockerfile
+7-1 b/‎3.13-rc/alpine3.19/Dockerfile
+7-1
diff --git a/‎3.13-rc/alpine3.20/Dockerfile
+7-1 b/‎3.13-rc/alpine3.20/Dockerfile
+7-1
diff --git a/‎3.13-rc/bookworm/Dockerfile
+7-1 b/‎3.13-rc/bookworm/Dockerfile
+7-1
diff --git a/‎3.13-rc/bullseye/Dockerfile
+7-1 b/‎3.13-rc/bullseye/Dockerfile
+7-1
diff --git a/‎3.13-rc/slim-bookworm/Dockerfile
+7-1 b/‎3.13-rc/slim-bookworm/Dockerfile
+7-1
diff --git a/‎3.13-rc/slim-bullseye/Dockerfile
+7-1 b/‎3.13-rc/slim-bullseye/Dockerfile
+7-1
diff --git a/‎3.8/alpine3.19/Dockerfile
+4-1 b/‎3.8/alpine3.19/Dockerfile
+4-1
diff --git a/‎3.8/alpine3.20/Dockerfile
+4-1 b/‎3.8/alpine3.20/Dockerfile
+4-1
diff --git a/‎3.8/bookworm/Dockerfile
+4-1 b/‎3.8/bookworm/Dockerfile
+4-1
diff --git a/‎3.8/bullseye/Dockerfile
+4-1 b/‎3.8/bullseye/Dockerfile
+4-1
diff --git a/‎3.8/slim-bookworm/Dockerfile
+4-1 b/‎3.8/slim-bookworm/Dockerfile
+4-1
diff --git a/‎3.8/slim-bullseye/Dockerfile
+4-1 b/‎3.8/slim-bullseye/Dockerfile
+4-1
diff --git a/‎3.9/alpine3.19/Dockerfile
+4-1 b/‎3.9/alpine3.19/Dockerfile
+4-1
diff --git a/‎3.9/alpine3.20/Dockerfile
+4-1 b/‎3.9/alpine3.20/Dockerfile
+4-1
diff --git a/‎3.9/bookworm/Dockerfile
+4-1 b/‎3.9/bookworm/Dockerfile
+4-1
diff --git a/‎3.9/bullseye/Dockerfile
+4-1 b/‎3.9/bullseye/Dockerfile
+4-1
diff --git a/‎3.9/slim-bookworm/Dockerfile
+4-1 b/‎3.9/slim-bookworm/Dockerfile
+4-1
diff --git a/‎3.9/slim-bullseye/Dockerfile
+4-1 b/‎3.9/slim-bullseye/Dockerfile
+4-1
diff --git a/‎Dockerfile-linux.template
+15-2 b/‎Dockerfile-linux.template
+15-2
@@ -307,10 +307,23 @@ RUN set -eux; \
 		"pip==$PYTHON_PIP_VERSION" \
 {{ if .setuptools then ( -}}
 		"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
-{{ ) else "" end -}}
+{{ ) else ( -}}
+		--no-setuptools \
+		--no-wheel \
+{{ ) end -}}
 	; \
 	rm -f get-pip.py; \
 	\
-	pip --version
+	pip --version; \
+{{ if .setuptools then ( -}}
+	# smoke test to ensure that setuptools/wheel are included
+	python -c 'import setuptools'; \
+	python -c 'import wheel'
+{{ ) else ( -}}
+	# smoke test to ensure that setuptools/wheel are not included
+	if python -c 'import setuptools' || python -c 'import wheel'; then \
+		exit 1; \
+	fi
+{{ ) end -}}
 
 CMD ["python3"]