From a8ec33a6ee730f8dbe74bbdef28e81baf4cddd12 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.10/alpine3.19/Dockerfile | 2 ++ 3.10/alpine3.20/Dockerfile | 2 ++ 3.10/bookworm/Dockerfile | 2 ++ 3.10/bullseye/Dockerfile | 2 ++ 3.10/slim-bookworm/Dockerfile | 2 ++ 3.10/slim-bullseye/Dockerfile | 2 ++ 3.11/alpine3.19/Dockerfile | 2 ++ 3.11/alpine3.20/Dockerfile | 2 ++ 3.11/bookworm/Dockerfile | 2 ++ 3.11/bullseye/Dockerfile | 2 ++ 3.11/slim-bookworm/Dockerfile | 2 ++ 3.11/slim-bullseye/Dockerfile | 2 ++ 3.11/windows/windowsservercore-1809/Dockerfile | 2 ++ 3.11/windows/windowsservercore-ltsc2022/Dockerfile | 2 ++ 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.12/windows/windowsservercore-1809/Dockerfile | 2 ++ 3.12/windows/windowsservercore-ltsc2022/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 ++ 3.13-rc/windows/windowsservercore-1809/Dockerfile | 2 ++ 3.13-rc/windows/windowsservercore-ltsc2022/Dockerfile | 2 ++ 3.8/alpine3.19/Dockerfile | 2 ++ 3.8/alpine3.20/Dockerfile | 2 ++ 3.8/bookworm/Dockerfile | 2 ++ 3.8/bullseye/Dockerfile | 2 ++ 3.8/slim-bookworm/Dockerfile | 2 ++ 3.8/slim-bullseye/Dockerfile | 2 ++ 3.9/alpine3.19/Dockerfile | 2 ++ 3.9/alpine3.20/Dockerfile | 2 ++ 3.9/bookworm/Dockerfile | 2 ++ 3.9/bullseye/Dockerfile | 2 ++ 3.9/slim-bookworm/Dockerfile | 2 ++ 3.9/slim-bullseye/Dockerfile | 2 ++ Dockerfile-linux.template | 7 ++++++- Dockerfile-windows.template | 7 ++++++- 44 files changed, 96 insertions(+), 2 deletions(-) diff --git a/3.10/alpine3.19/Dockerfile b/3.10/alpine3.19/Dockerfile index e2df90f98..95312d169 100644 --- a/3.10/alpine3.19/Dockerfile +++ b/3.10/alpine3.19/Dockerfile @@ -151,6 +151,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.10/alpine3.20/Dockerfile b/3.10/alpine3.20/Dockerfile index c35864b6d..9c33c4ebc 100644 --- a/3.10/alpine3.20/Dockerfile +++ b/3.10/alpine3.20/Dockerfile @@ -151,6 +151,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.10/bookworm/Dockerfile b/3.10/bookworm/Dockerfile index 834eff219..379e406ed 100644 --- a/3.10/bookworm/Dockerfile +++ b/3.10/bookworm/Dockerfile @@ -121,6 +121,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.10/bullseye/Dockerfile b/3.10/bullseye/Dockerfile index beebe24e9..d0988b0c4 100644 --- a/3.10/bullseye/Dockerfile +++ b/3.10/bullseye/Dockerfile @@ -121,6 +121,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.10/slim-bookworm/Dockerfile b/3.10/slim-bookworm/Dockerfile index 161ac5bc9..b01c03a38 100644 --- a/3.10/slim-bookworm/Dockerfile +++ b/3.10/slim-bookworm/Dockerfile @@ -164,6 +164,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.10/slim-bullseye/Dockerfile b/3.10/slim-bullseye/Dockerfile index eb1e96221..88c0ace67 100644 --- a/3.10/slim-bullseye/Dockerfile +++ b/3.10/slim-bullseye/Dockerfile @@ -164,6 +164,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.11/alpine3.19/Dockerfile b/3.11/alpine3.19/Dockerfile index cdc2a33a5..de974a586 100644 --- a/3.11/alpine3.19/Dockerfile +++ b/3.11/alpine3.19/Dockerfile @@ -151,6 +151,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.11/alpine3.20/Dockerfile b/3.11/alpine3.20/Dockerfile index 7c7631591..47bc1d2f2 100644 --- a/3.11/alpine3.20/Dockerfile +++ b/3.11/alpine3.20/Dockerfile @@ -151,6 +151,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.11/bookworm/Dockerfile b/3.11/bookworm/Dockerfile index e08925e0e..b307e8cf3 100644 --- a/3.11/bookworm/Dockerfile +++ b/3.11/bookworm/Dockerfile @@ -121,6 +121,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.11/bullseye/Dockerfile b/3.11/bullseye/Dockerfile index daf971883..acba47ace 100644 --- a/3.11/bullseye/Dockerfile +++ b/3.11/bullseye/Dockerfile @@ -121,6 +121,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.11/slim-bookworm/Dockerfile b/3.11/slim-bookworm/Dockerfile index 9cc556180..702ec31aa 100644 --- a/3.11/slim-bookworm/Dockerfile +++ b/3.11/slim-bookworm/Dockerfile @@ -164,6 +164,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.11/slim-bullseye/Dockerfile b/3.11/slim-bullseye/Dockerfile index 23343f738..dede33689 100644 --- a/3.11/slim-bullseye/Dockerfile +++ b/3.11/slim-bullseye/Dockerfile @@ -164,6 +164,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.11/windows/windowsservercore-1809/Dockerfile b/3.11/windows/windowsservercore-1809/Dockerfile index 974e8d197..f48077597 100644 --- a/3.11/windows/windowsservercore-1809/Dockerfile +++ b/3.11/windows/windowsservercore-1809/Dockerfile @@ -76,6 +76,8 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --no-compile \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.11/windows/windowsservercore-ltsc2022/Dockerfile b/3.11/windows/windowsservercore-ltsc2022/Dockerfile index e4f543ce7..8f0c59f32 100644 --- a/3.11/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.11/windows/windowsservercore-ltsc2022/Dockerfile @@ -76,6 +76,8 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --no-compile \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.12/alpine3.19/Dockerfile b/3.12/alpine3.19/Dockerfile index e507f772b..3825da6ee 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/alpine3.20/Dockerfile b/3.12/alpine3.20/Dockerfile index 642dd8949..c87b36aa5 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/bookworm/Dockerfile b/3.12/bookworm/Dockerfile index 297d54ff6..9baabe704 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/bullseye/Dockerfile b/3.12/bullseye/Dockerfile index 09cedcd10..dd7daf0c2 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/slim-bookworm/Dockerfile b/3.12/slim-bookworm/Dockerfile index 703e21995..d697b55e1 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/slim-bullseye/Dockerfile b/3.12/slim-bullseye/Dockerfile index 610cb1578..e284484d3 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.12/windows/windowsservercore-1809/Dockerfile b/3.12/windows/windowsservercore-1809/Dockerfile index da6bf74cf..617949ef5 100644 --- a/3.12/windows/windowsservercore-1809/Dockerfile +++ b/3.12/windows/windowsservercore-1809/Dockerfile @@ -73,6 +73,8 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --no-cache-dir \ --no-compile \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + --no-setuptools \ + --no-wheel \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.12/windows/windowsservercore-ltsc2022/Dockerfile b/3.12/windows/windowsservercore-ltsc2022/Dockerfile index a46ad272a..f6071cc81 100644 --- a/3.12/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.12/windows/windowsservercore-ltsc2022/Dockerfile @@ -73,6 +73,8 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --no-cache-dir \ --no-compile \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + --no-setuptools \ + --no-wheel \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.13-rc/alpine3.19/Dockerfile b/3.13-rc/alpine3.19/Dockerfile index 179ca694a..ef8e5d956 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-setuptools \ + --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..85d7f11d3 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/bookworm/Dockerfile b/3.13-rc/bookworm/Dockerfile index c07cf0c4f..6ffa3bacc 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/bullseye/Dockerfile b/3.13-rc/bullseye/Dockerfile index d881905e6..11f87d5ba 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-setuptools \ + --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..102a0c029 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-setuptools \ + --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..c79f91b86 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-setuptools \ + --no-wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.13-rc/windows/windowsservercore-1809/Dockerfile b/3.13-rc/windows/windowsservercore-1809/Dockerfile index 50209aa19..f188c62cf 100644 --- a/3.13-rc/windows/windowsservercore-1809/Dockerfile +++ b/3.13-rc/windows/windowsservercore-1809/Dockerfile @@ -73,6 +73,8 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --no-cache-dir \ --no-compile \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + --no-setuptools \ + --no-wheel \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.13-rc/windows/windowsservercore-ltsc2022/Dockerfile b/3.13-rc/windows/windowsservercore-ltsc2022/Dockerfile index 1d5a12214..8beeaf6cb 100644 --- a/3.13-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.13-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -73,6 +73,8 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --no-cache-dir \ --no-compile \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + --no-setuptools \ + --no-wheel \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.8/alpine3.19/Dockerfile b/3.8/alpine3.19/Dockerfile index cf07a1efc..2a06391d5 100644 --- a/3.8/alpine3.19/Dockerfile +++ b/3.8/alpine3.19/Dockerfile @@ -151,6 +151,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.8/alpine3.20/Dockerfile b/3.8/alpine3.20/Dockerfile index 25e85fb89..780c149e5 100644 --- a/3.8/alpine3.20/Dockerfile +++ b/3.8/alpine3.20/Dockerfile @@ -151,6 +151,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.8/bookworm/Dockerfile b/3.8/bookworm/Dockerfile index 9d5e6054d..cf13c98d8 100644 --- a/3.8/bookworm/Dockerfile +++ b/3.8/bookworm/Dockerfile @@ -121,6 +121,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.8/bullseye/Dockerfile b/3.8/bullseye/Dockerfile index d3558384b..3df0c2f90 100644 --- a/3.8/bullseye/Dockerfile +++ b/3.8/bullseye/Dockerfile @@ -121,6 +121,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.8/slim-bookworm/Dockerfile b/3.8/slim-bookworm/Dockerfile index 77d129db1..e4d09d858 100644 --- a/3.8/slim-bookworm/Dockerfile +++ b/3.8/slim-bookworm/Dockerfile @@ -164,6 +164,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.8/slim-bullseye/Dockerfile b/3.8/slim-bullseye/Dockerfile index a19592400..1ae8504d7 100644 --- a/3.8/slim-bullseye/Dockerfile +++ b/3.8/slim-bullseye/Dockerfile @@ -164,6 +164,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.9/alpine3.19/Dockerfile b/3.9/alpine3.19/Dockerfile index 0f7431f34..4ba1aed28 100644 --- a/3.9/alpine3.19/Dockerfile +++ b/3.9/alpine3.19/Dockerfile @@ -150,6 +150,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.9/alpine3.20/Dockerfile b/3.9/alpine3.20/Dockerfile index c9913cb7b..f4717dfc0 100644 --- a/3.9/alpine3.20/Dockerfile +++ b/3.9/alpine3.20/Dockerfile @@ -150,6 +150,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.9/bookworm/Dockerfile b/3.9/bookworm/Dockerfile index 81ee9f835..11daa63b9 100644 --- a/3.9/bookworm/Dockerfile +++ b/3.9/bookworm/Dockerfile @@ -120,6 +120,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.9/bullseye/Dockerfile b/3.9/bullseye/Dockerfile index 6dd423917..a81a9cc7f 100644 --- a/3.9/bullseye/Dockerfile +++ b/3.9/bullseye/Dockerfile @@ -120,6 +120,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.9/slim-bookworm/Dockerfile b/3.9/slim-bookworm/Dockerfile index 61e4b6a03..3a61e3efe 100644 --- a/3.9/slim-bookworm/Dockerfile +++ b/3.9/slim-bookworm/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/3.9/slim-bullseye/Dockerfile b/3.9/slim-bullseye/Dockerfile index 46d63c20c..6e61a809c 100644 --- a/3.9/slim-bullseye/Dockerfile +++ b/3.9/slim-bullseye/Dockerfile @@ -163,6 +163,8 @@ RUN set -eux; \ --no-compile \ "pip==$PYTHON_PIP_VERSION" \ "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + # get-pip.py installs wheel by default, adding in case get-pip defaults change + wheel \ ; \ rm -f get-pip.py; \ \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 456a31de3..939355f8b 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -307,7 +307,12 @@ RUN set -eux; \ "pip==$PYTHON_PIP_VERSION" \ {{ if .setuptools then ( -}} "setuptools==$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 -}} ; \ rm -f get-pip.py; \ \ diff --git a/Dockerfile-windows.template b/Dockerfile-windows.template index aac1b3ea3..da01b7033 100644 --- 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; \ \