From bb68424de76756a2d3dc817f87b1f8640112461f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 7 Sep 2021 15:48:43 -0700 Subject: [PATCH] Pin pip to 21.2.x and setuptools to 57.x --- 3.10-rc/alpine3.13/Dockerfile | 3 ++ 3.10-rc/alpine3.14/Dockerfile | 3 ++ 3.10-rc/bullseye/Dockerfile | 3 ++ 3.10-rc/bullseye/slim/Dockerfile | 3 ++ 3.10-rc/buster/Dockerfile | 3 ++ 3.10-rc/buster/slim/Dockerfile | 3 ++ .../windows/windowsservercore-1809/Dockerfile | 3 ++ .../windowsservercore-ltsc2016/Dockerfile | 3 ++ .../windowsservercore-ltsc2022/Dockerfile | 3 ++ 3.6/alpine3.13/Dockerfile | 3 ++ 3.6/alpine3.14/Dockerfile | 3 ++ 3.6/bullseye/Dockerfile | 3 ++ 3.6/bullseye/slim/Dockerfile | 3 ++ 3.6/buster/Dockerfile | 3 ++ 3.6/buster/slim/Dockerfile | 3 ++ 3.7/alpine3.13/Dockerfile | 3 ++ 3.7/alpine3.14/Dockerfile | 3 ++ 3.7/bullseye/Dockerfile | 3 ++ 3.7/bullseye/slim/Dockerfile | 3 ++ 3.7/buster/Dockerfile | 3 ++ 3.7/buster/slim/Dockerfile | 3 ++ 3.8/alpine3.13/Dockerfile | 3 ++ 3.8/alpine3.14/Dockerfile | 3 ++ 3.8/bullseye/Dockerfile | 3 ++ 3.8/bullseye/slim/Dockerfile | 3 ++ 3.8/buster/Dockerfile | 3 ++ 3.8/buster/slim/Dockerfile | 3 ++ 3.9/alpine3.13/Dockerfile | 3 ++ 3.9/alpine3.14/Dockerfile | 3 ++ 3.9/bullseye/Dockerfile | 3 ++ 3.9/bullseye/slim/Dockerfile | 3 ++ 3.9/buster/Dockerfile | 3 ++ 3.9/buster/slim/Dockerfile | 3 ++ 3.9/windows/windowsservercore-1809/Dockerfile | 3 ++ .../windowsservercore-ltsc2016/Dockerfile | 3 ++ .../windowsservercore-ltsc2022/Dockerfile | 3 ++ Dockerfile-alpine.template | 3 ++ Dockerfile-debian.template | 3 ++ Dockerfile-slim.template | 3 ++ Dockerfile-windowsservercore.template | 3 ++ update.sh | 52 ++++++++++++++++++- 41 files changed, 170 insertions(+), 2 deletions(-) diff --git a/3.10-rc/alpine3.13/Dockerfile b/3.10-rc/alpine3.13/Dockerfile index 8822af96c..962e8bb19 100644 --- a/3.10-rc/alpine3.13/Dockerfile +++ b/3.10-rc/alpine3.13/Dockerfile @@ -115,6 +115,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -128,6 +130,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.10-rc/alpine3.14/Dockerfile b/3.10-rc/alpine3.14/Dockerfile index 4d5b32b8c..5a416a4c3 100644 --- a/3.10-rc/alpine3.14/Dockerfile +++ b/3.10-rc/alpine3.14/Dockerfile @@ -115,6 +115,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -128,6 +130,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.10-rc/bullseye/Dockerfile b/3.10-rc/bullseye/Dockerfile index 6cda10523..463919c85 100644 --- a/3.10-rc/bullseye/Dockerfile +++ b/3.10-rc/bullseye/Dockerfile @@ -70,6 +70,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -83,6 +85,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.10-rc/bullseye/slim/Dockerfile b/3.10-rc/bullseye/slim/Dockerfile index 13f34b4b9..a6d2695fa 100644 --- a/3.10-rc/bullseye/slim/Dockerfile +++ b/3.10-rc/bullseye/slim/Dockerfile @@ -110,6 +110,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -132,6 +134,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.10-rc/buster/Dockerfile b/3.10-rc/buster/Dockerfile index b8ec747be..562ce07de 100644 --- a/3.10-rc/buster/Dockerfile +++ b/3.10-rc/buster/Dockerfile @@ -70,6 +70,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -83,6 +85,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.10-rc/buster/slim/Dockerfile b/3.10-rc/buster/slim/Dockerfile index 47cc3c424..203cbaf1c 100644 --- a/3.10-rc/buster/slim/Dockerfile +++ b/3.10-rc/buster/slim/Dockerfile @@ -110,6 +110,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -132,6 +134,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.10-rc/windows/windowsservercore-1809/Dockerfile b/3.10-rc/windows/windowsservercore-1809/Dockerfile index af714cb61..d2d66c1ae 100644 --- a/3.10-rc/windows/windowsservercore-1809/Dockerfile +++ b/3.10-rc/windows/windowsservercore-1809/Dockerfile @@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --disable-pip-version-check \ --no-cache-dir \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.10-rc/windows/windowsservercore-ltsc2016/Dockerfile b/3.10-rc/windows/windowsservercore-ltsc2016/Dockerfile index b5648e10d..291626366 100644 --- a/3.10-rc/windows/windowsservercore-ltsc2016/Dockerfile +++ b/3.10-rc/windows/windowsservercore-ltsc2016/Dockerfile @@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --disable-pip-version-check \ --no-cache-dir \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.10-rc/windows/windowsservercore-ltsc2022/Dockerfile b/3.10-rc/windows/windowsservercore-ltsc2022/Dockerfile index ca8d55ef0..84241a067 100644 --- a/3.10-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.10-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --disable-pip-version-check \ --no-cache-dir \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.6/alpine3.13/Dockerfile b/3.6/alpine3.13/Dockerfile index 2106a05ea..f3eaaeb05 100644 --- a/3.6/alpine3.13/Dockerfile +++ b/3.6/alpine3.13/Dockerfile @@ -149,6 +149,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -162,6 +164,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.6/alpine3.14/Dockerfile b/3.6/alpine3.14/Dockerfile index 9dd751e85..4ea306d5a 100644 --- a/3.6/alpine3.14/Dockerfile +++ b/3.6/alpine3.14/Dockerfile @@ -149,6 +149,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -162,6 +164,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.6/bullseye/Dockerfile b/3.6/bullseye/Dockerfile index 948c786f5..f1c026f05 100644 --- a/3.6/bullseye/Dockerfile +++ b/3.6/bullseye/Dockerfile @@ -106,6 +106,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -119,6 +121,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.6/bullseye/slim/Dockerfile b/3.6/bullseye/slim/Dockerfile index b394d72ff..26a23c7c4 100644 --- a/3.6/bullseye/slim/Dockerfile +++ b/3.6/bullseye/slim/Dockerfile @@ -145,6 +145,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -167,6 +169,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.6/buster/Dockerfile b/3.6/buster/Dockerfile index 9df1974c5..f1b42a866 100644 --- a/3.6/buster/Dockerfile +++ b/3.6/buster/Dockerfile @@ -106,6 +106,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -119,6 +121,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.6/buster/slim/Dockerfile b/3.6/buster/slim/Dockerfile index 7e396f110..8216e6bad 100644 --- a/3.6/buster/slim/Dockerfile +++ b/3.6/buster/slim/Dockerfile @@ -145,6 +145,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -167,6 +169,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.7/alpine3.13/Dockerfile b/3.7/alpine3.13/Dockerfile index ad34ba9ad..55f2f4ba7 100644 --- a/3.7/alpine3.13/Dockerfile +++ b/3.7/alpine3.13/Dockerfile @@ -150,6 +150,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -163,6 +165,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.7/alpine3.14/Dockerfile b/3.7/alpine3.14/Dockerfile index 3b80063fd..164d12780 100644 --- a/3.7/alpine3.14/Dockerfile +++ b/3.7/alpine3.14/Dockerfile @@ -150,6 +150,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -163,6 +165,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.7/bullseye/Dockerfile b/3.7/bullseye/Dockerfile index 506040c41..2e22fbb8d 100644 --- a/3.7/bullseye/Dockerfile +++ b/3.7/bullseye/Dockerfile @@ -107,6 +107,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -120,6 +122,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.7/bullseye/slim/Dockerfile b/3.7/bullseye/slim/Dockerfile index 60f68b4f7..75d9d639d 100644 --- a/3.7/bullseye/slim/Dockerfile +++ b/3.7/bullseye/slim/Dockerfile @@ -146,6 +146,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -168,6 +170,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.7/buster/Dockerfile b/3.7/buster/Dockerfile index 967c53ae2..952d3bd45 100644 --- a/3.7/buster/Dockerfile +++ b/3.7/buster/Dockerfile @@ -107,6 +107,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -120,6 +122,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.7/buster/slim/Dockerfile b/3.7/buster/slim/Dockerfile index 9d027bdb3..b3fa5fea8 100644 --- a/3.7/buster/slim/Dockerfile +++ b/3.7/buster/slim/Dockerfile @@ -146,6 +146,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -168,6 +170,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.8/alpine3.13/Dockerfile b/3.8/alpine3.13/Dockerfile index 030f36c57..25d1f9299 100644 --- a/3.8/alpine3.13/Dockerfile +++ b/3.8/alpine3.13/Dockerfile @@ -114,6 +114,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -127,6 +129,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.8/alpine3.14/Dockerfile b/3.8/alpine3.14/Dockerfile index fe108ebf0..ec449c18e 100644 --- a/3.8/alpine3.14/Dockerfile +++ b/3.8/alpine3.14/Dockerfile @@ -114,6 +114,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -127,6 +129,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.8/bullseye/Dockerfile b/3.8/bullseye/Dockerfile index 629302588..97c10c412 100644 --- a/3.8/bullseye/Dockerfile +++ b/3.8/bullseye/Dockerfile @@ -71,6 +71,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -84,6 +86,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.8/bullseye/slim/Dockerfile b/3.8/bullseye/slim/Dockerfile index 26990cb41..ae5100b9b 100644 --- a/3.8/bullseye/slim/Dockerfile +++ b/3.8/bullseye/slim/Dockerfile @@ -110,6 +110,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -132,6 +134,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.8/buster/Dockerfile b/3.8/buster/Dockerfile index d0f8423b0..bf5a44356 100644 --- a/3.8/buster/Dockerfile +++ b/3.8/buster/Dockerfile @@ -71,6 +71,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -84,6 +86,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.8/buster/slim/Dockerfile b/3.8/buster/slim/Dockerfile index f75336989..961c10492 100644 --- a/3.8/buster/slim/Dockerfile +++ b/3.8/buster/slim/Dockerfile @@ -110,6 +110,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -132,6 +134,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.9/alpine3.13/Dockerfile b/3.9/alpine3.13/Dockerfile index 0f7388f87..b159972b1 100644 --- a/3.9/alpine3.13/Dockerfile +++ b/3.9/alpine3.13/Dockerfile @@ -115,6 +115,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -128,6 +130,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.9/alpine3.14/Dockerfile b/3.9/alpine3.14/Dockerfile index 1e2957b7c..1b6153b27 100644 --- a/3.9/alpine3.14/Dockerfile +++ b/3.9/alpine3.14/Dockerfile @@ -115,6 +115,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -128,6 +130,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.9/bullseye/Dockerfile b/3.9/bullseye/Dockerfile index b5505cc74..7b6c62a08 100644 --- a/3.9/bullseye/Dockerfile +++ b/3.9/bullseye/Dockerfile @@ -70,6 +70,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -83,6 +85,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.9/bullseye/slim/Dockerfile b/3.9/bullseye/slim/Dockerfile index 601fca4bb..226572ea2 100644 --- a/3.9/bullseye/slim/Dockerfile +++ b/3.9/bullseye/slim/Dockerfile @@ -110,6 +110,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -132,6 +134,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.9/buster/Dockerfile b/3.9/buster/Dockerfile index 972e22515..fcf16c76a 100644 --- a/3.9/buster/Dockerfile +++ b/3.9/buster/Dockerfile @@ -70,6 +70,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -83,6 +85,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.9/buster/slim/Dockerfile b/3.9/buster/slim/Dockerfile index 40cf6ca51..3eadc4665 100644 --- a/3.9/buster/slim/Dockerfile +++ b/3.9/buster/slim/Dockerfile @@ -110,6 +110,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -132,6 +134,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/3.9/windows/windowsservercore-1809/Dockerfile b/3.9/windows/windowsservercore-1809/Dockerfile index 58b5441c0..88c187f97 100644 --- a/3.9/windows/windowsservercore-1809/Dockerfile +++ b/3.9/windows/windowsservercore-1809/Dockerfile @@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --disable-pip-version-check \ --no-cache-dir \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.9/windows/windowsservercore-ltsc2016/Dockerfile b/3.9/windows/windowsservercore-ltsc2016/Dockerfile index b4bd0c4fc..49ce12f41 100644 --- a/3.9/windows/windowsservercore-ltsc2016/Dockerfile +++ b/3.9/windows/windowsservercore-ltsc2016/Dockerfile @@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --disable-pip-version-check \ --no-cache-dir \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/3.9/windows/windowsservercore-ltsc2022/Dockerfile b/3.9/windows/windowsservercore-ltsc2022/Dockerfile index b038f5e47..0e766c33c 100644 --- a/3.9/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.9/windows/windowsservercore-ltsc2022/Dockerfile @@ -53,6 +53,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 21.2.4 +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION 57.5.0 # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/c20b0cfd643cd4a19246ccf204e2997af70f6b21/public/get-pip.py ENV PYTHON_GET_PIP_SHA256 fa6f3fb93cce234cd4e8dd2beb54a51ab9c247653b52855a48dd44e6b21ff28b @@ -71,6 +73,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --disable-pip-version-check \ --no-cache-dir \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 66d2cd866..de003844e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -146,6 +146,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION %%PLACEHOLDER%% +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION %%PLACEHOLDER%% # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL %%PLACEHOLDER%% ENV PYTHON_GET_PIP_SHA256 %%PLACEHOLDER%% @@ -159,6 +161,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 858d6e1e9..32c8d2b99 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -101,6 +101,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION %%PLACEHOLDER%% +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION %%PLACEHOLDER%% # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL %%PLACEHOLDER%% ENV PYTHON_GET_PIP_SHA256 %%PLACEHOLDER%% @@ -114,6 +116,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 4dbfd1117..9a8755f57 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -141,6 +141,8 @@ RUN cd /usr/local/bin \ # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION %%PLACEHOLDER%% +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION %%PLACEHOLDER%% # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL %%PLACEHOLDER%% ENV PYTHON_GET_PIP_SHA256 %%PLACEHOLDER%% @@ -163,6 +165,7 @@ RUN set -ex; \ --disable-pip-version-check \ --no-cache-dir \ "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ ; \ pip --version; \ \ diff --git a/Dockerfile-windowsservercore.template b/Dockerfile-windowsservercore.template index f1431d323..c0749ff99 100644 --- a/Dockerfile-windowsservercore.template +++ b/Dockerfile-windowsservercore.template @@ -47,6 +47,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION %%PLACEHOLDER%% +# https://github.com/docker-library/python/issues/365 +ENV PYTHON_SETUPTOOLS_VERSION %%PLACEHOLDER%% # https://github.com/pypa/get-pip ENV PYTHON_GET_PIP_URL %%PLACEHOLDER%% ENV PYTHON_GET_PIP_SHA256 %%PLACEHOLDER%% @@ -65,6 +67,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL); --disable-pip-version-check \ --no-cache-dir \ ('pip=={0}' -f $env:PYTHON_PIP_VERSION) \ + ('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \ ; \ Remove-Item get-pip.py -Force; \ \ diff --git a/update.sh b/update.sh index 86b19c5a3..dd9bfe7de 100755 --- a/update.sh +++ b/update.sh @@ -25,6 +25,26 @@ declare -A gpgKeys=( # https://www.python.org/dev/peps/pep-0619/#release-manager-and-crew ) +# https://github.com/docker-library/python/issues/365 +# https://pypi.org/project/pip/#history +declare -A pipVersions=( + [3.10]='21.2' # https://github.com/python/cpython/blob/3.10/Lib/ensurepip/__init__.py -- "_PIP_VERSION" + [3.9]='21.2' # https://github.com/python/cpython/blob/3.9/Lib/ensurepip/__init__.py -- "_PIP_VERSION" + [3.8]='21.2' # historical + [3.7]='21.2' # historical + [3.6]='21.2' # historical +) +# https://pypi.org/project/setuptools/#history +declare -A setuptoolsVersions=( + [3.10]='57' # https://github.com/python/cpython/blob/3.10/Lib/ensurepip/__init__.py -- "_SETUPTOOLS_VERSION" + [3.9]='57' # https://github.com/python/cpython/blob/3.9/Lib/ensurepip/__init__.py -- "_SETUPTOOLS_VERSION" + [3.8]='57' # historical + [3.7]='57' # historical + [3.6]='57' # historical +) +# https://pypi.org/project/wheel/#history +# TODO wheelVersions: https://github.com/docker-library/python/issues/365#issuecomment-914669320 + cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" versions=( "$@" ) @@ -33,7 +53,9 @@ if [ ${#versions[@]} -eq 0 ]; then fi versions=( "${versions[@]%/}" ) -pipVersion="$(curl -fsSL 'https://pypi.org/pypi/pip/json' | jq -r .info.version)" +pipJson="$(curl -fsSL 'https://pypi.org/pypi/pip/json')" +setuptoolsJson="$(curl -fsSL 'https://pypi.org/pypi/setuptools/json')" + getPipCommit="$(curl -fsSL 'https://github.com/pypa/get-pip/commits/main/public/get-pip.py.atom' | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" getPipUrl="https://github.com/pypa/get-pip/raw/$getPipCommit/public/get-pip.py" getPipSha256="$(curl -fsSL "$getPipUrl" | sha256sum | cut -d' ' -f1)" @@ -129,7 +151,32 @@ for version in "${versions[@]}"; do exit 1 fi - echo "$version: $fullVersion" + pipVersion="${pipVersions[$rcVersion]}" + pipVersion="$( + export pipVersion + jq <<<"$pipJson" -r ' + .releases + | [ + keys_unsorted[] + | select(. == env.pipVersion or startswith(env.pipVersion + ".")) + ] + | max_by(split(".") | map(tonumber)) + ' + )" + setuptoolsVersion="${setuptoolsVersions[$rcVersion]}" + setuptoolsVersion="$( + export setuptoolsVersion + jq <<<"$setuptoolsJson" -r ' + .releases + | [ + keys_unsorted[] + | select(. == env.setuptoolsVersion or startswith(env.setuptoolsVersion + ".")) + ] + | max_by(split(".") | map(tonumber)) + ' + )" + + echo "$version: $fullVersion (pip $pipVersion, setuptools $setuptoolsVersion)" for v in \ alpine{3.14,3.13} \ @@ -160,6 +207,7 @@ for version in "${versions[@]}"; do -e 's/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/' \ -e 's/^(ENV PYTHON_RELEASE) .*/\1 '"${fullVersion%%[a-z]*}"'/' \ -e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/' \ + -e 's/^(ENV PYTHON_SETUPTOOLS_VERSION) .*/\1 '"$setuptoolsVersion"'/' \ -e 's!^(ENV PYTHON_GET_PIP_URL) .*!\1 '"$getPipUrl"'!' \ -e 's!^(ENV PYTHON_GET_PIP_SHA256) .*!\1 '"$getPipSha256"'!' \ -e 's/^(FROM python):.*/\1:'"$version-$tag"'/' \