From 3889aba3d0578f2d42b8a689563fee059ac05f1a Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Fri, 23 Aug 2024 16:39:33 -0700 Subject: [PATCH] Stop installing setuptools in python 3.12+ --- 3.12/alpine3.19/Dockerfile | 2 ++ 3.12/alpine3.20/Dockerfile | 2 ++ 3.12/bookworm/Dockerfile | 2 ++ 3.12/bullseye/Dockerfile | 2 ++ 3.12/slim-bookworm/Dockerfile | 2 ++ 3.12/slim-bullseye/Dockerfile | 2 ++ 3.13-rc/alpine3.19/Dockerfile | 2 ++ 3.13-rc/alpine3.20/Dockerfile | 2 ++ 3.13-rc/bookworm/Dockerfile | 2 ++ 3.13-rc/bullseye/Dockerfile | 2 ++ 3.13-rc/slim-bookworm/Dockerfile | 2 ++ 3.13-rc/slim-bullseye/Dockerfile | 2 ++ Dockerfile-linux.template | 5 ++++- 13 files changed, 28 insertions(+), 1 deletion(-) diff --git a/3.12/alpine3.19/Dockerfile b/3.12/alpine3.19/Dockerfile index e507f772b..20d7e92f2 100644 --- a/3.12/alpine3.19/Dockerfile +++ b/3.12/alpine3.19/Dockerfile @@ -148,6 +148,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/alpine3.20/Dockerfile b/3.12/alpine3.20/Dockerfile index 642dd8949..018331a58 100644 --- a/3.12/alpine3.20/Dockerfile +++ b/3.12/alpine3.20/Dockerfile @@ -148,6 +148,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/bookworm/Dockerfile b/3.12/bookworm/Dockerfile index 297d54ff6..f6a98c0dd 100644 --- a/3.12/bookworm/Dockerfile +++ b/3.12/bookworm/Dockerfile @@ -118,6 +118,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/bullseye/Dockerfile b/3.12/bullseye/Dockerfile index 09cedcd10..f839a7021 100644 --- a/3.12/bullseye/Dockerfile +++ b/3.12/bullseye/Dockerfile @@ -118,6 +118,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/slim-bookworm/Dockerfile b/3.12/slim-bookworm/Dockerfile index 703e21995..2550fa2fc 100644 --- a/3.12/slim-bookworm/Dockerfile +++ b/3.12/slim-bookworm/Dockerfile @@ -161,6 +161,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/slim-bullseye/Dockerfile b/3.12/slim-bullseye/Dockerfile index 610cb1578..e50b1d477 100644 --- a/3.12/slim-bullseye/Dockerfile +++ b/3.12/slim-bullseye/Dockerfile @@ -161,6 +161,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/alpine3.19/Dockerfile b/3.13-rc/alpine3.19/Dockerfile index 179ca694a..4def207ba 100644 --- a/3.13-rc/alpine3.19/Dockerfile +++ b/3.13-rc/alpine3.19/Dockerfile @@ -143,6 +143,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/alpine3.20/Dockerfile b/3.13-rc/alpine3.20/Dockerfile index 7f3398481..289a28a35 100644 --- a/3.13-rc/alpine3.20/Dockerfile +++ b/3.13-rc/alpine3.20/Dockerfile @@ -143,6 +143,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/bookworm/Dockerfile b/3.13-rc/bookworm/Dockerfile index c07cf0c4f..4d524b58a 100644 --- a/3.13-rc/bookworm/Dockerfile +++ b/3.13-rc/bookworm/Dockerfile @@ -113,6 +113,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/bullseye/Dockerfile b/3.13-rc/bullseye/Dockerfile index d881905e6..5dd42e986 100644 --- a/3.13-rc/bullseye/Dockerfile +++ b/3.13-rc/bullseye/Dockerfile @@ -113,6 +113,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/slim-bookworm/Dockerfile b/3.13-rc/slim-bookworm/Dockerfile index 359960a29..4f78cd69c 100644 --- a/3.13-rc/slim-bookworm/Dockerfile +++ b/3.13-rc/slim-bookworm/Dockerfile @@ -156,6 +156,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/slim-bullseye/Dockerfile b/3.13-rc/slim-bullseye/Dockerfile index 28289c79b..c17a15fe3 100644 --- a/3.13-rc/slim-bullseye/Dockerfile +++ b/3.13-rc/slim-bullseye/Dockerfile @@ -156,6 +156,8 @@ RUN set -eux; \ --no-cache-dir \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ + --no-setup-tools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 456a31de3..33ab2aba7 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -307,7 +307,10 @@ RUN set -eux; \ "pip==$PYTHON_PIP_VERSION" \ {{ if .setuptools then ( -}} "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ -{{ ) else "" end -}} +{{ ) else ( -}} + --no-setup-tools \ + --no-wheel \ +{{ ) end -}} ; \ rm -f get-pip.py; \ \