diff --git a/3.10/alpine3.19/Dockerfile b/3.10/alpine3.19/Dockerfile index c574f1316..e53a0366c 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 ebd102ad4..5342ae231 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 094779224..2497ab7c0 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 ecee963e4..db718d152 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 c2e9542d3..467f6f65d 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 99257287a..d55133b8a 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 e72e11d76..5de491384 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 4e22cda67..85660844b 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 0aed427fc..7727dc104 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 2b441aca5..fc97b890a 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 a684e3bbb..4b9731d04 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 ff2e9fa48..93f79875c 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 8ba04f37e..ec60cc6c5 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 067a65630..7ae25670c 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 b1e37d88a..071de980c 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 bc962e67a..b9fc0e34a 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 05b326bfb..0c6f94878 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 9b09ee393..e5e24f2c0 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 8627fb462..515dc4076 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 340634d14..b53078282 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 f416f81eb..242a97242 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 ee25e6907..75311cb2c 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 c950ca9bb..be1378283 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 e42505eb1..8d95194bc 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 da943e3a5..019227c1c 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 1d536fb41..32804196d 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 bb43f4e55..901f7ecf3 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 f6ab07ab8..8f077e431 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 8ddfb7d20..9c7fa5a6b 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 43fde9fab..8bf8a6e88 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 d5af0a539..c64edbd83 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 4177d872a..5a4ff5a9e 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 123d2f239..e09ec334c 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 40899609a..e10624bc2 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 ba5ffed05..1af1fab8f 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 c803bc1de..af6294985 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 f6185d56a..196dc2edf 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 4fe5fca0c..67705b5e9 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 fd48d3ae5..1a5737a8a 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 bc77d8634..01a1da740 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 599f3f9ae..bccfb2f57 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 4729efc42..09ec5ca08 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; \ \