diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 3c124783e..de94394f4 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_SETUPTOOLS_VERSION 34.3.3 +ENV PYTHON_WHEEL_VERSION 0.30.0a0 RUN set -ex \ && buildDeps=' \ @@ -50,7 +52,10 @@ RUN set -ex \ # we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 - && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ + && pip install --no-cache-dir --upgrade --force-reinstall \ + "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + "wheel==$PYTHON_WHEEL_VERSION" \ # then we use "pip list" to ensure we don't have more than one pip version installed # https://github.com/docker-library/python/pull/100 && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile index fe299aa02..d765aea21 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -16,6 +16,8 @@ ENV PYTHON_VERSION 2.7.13 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_SETUPTOOLS_VERSION 34.3.3 +ENV PYTHON_WHEEL_VERSION 0.30.0a0 RUN set -ex \ && apk add --no-cache --virtual .fetch-deps \ @@ -67,7 +69,10 @@ RUN set -ex \ # we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 - && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ + && pip install --no-cache-dir --upgrade --force-reinstall \ + "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + "wheel==$PYTHON_WHEEL_VERSION" \ # then we use "pip list" to ensure we don't have more than one pip version installed # https://github.com/docker-library/python/pull/100 && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile index fa8a55d60..14427f30b 100644 --- a/2.7/slim/Dockerfile +++ b/2.7/slim/Dockerfile @@ -20,6 +20,8 @@ ENV PYTHON_VERSION 2.7.13 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_SETUPTOOLS_VERSION 34.3.3 +ENV PYTHON_WHEEL_VERSION 0.30.0a0 RUN set -ex \ && buildDeps=' \ @@ -65,7 +67,10 @@ RUN set -ex \ # we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 - && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ + && pip install --no-cache-dir --upgrade --force-reinstall \ + "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + "wheel==$PYTHON_WHEEL_VERSION" \ # then we use "pip list" to ensure we don't have more than one pip version installed # https://github.com/docker-library/python/pull/100 && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \ diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile index b14b748a0..9a9af5471 100644 --- a/2.7/wheezy/Dockerfile +++ b/2.7/wheezy/Dockerfile @@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" ENV PYTHON_PIP_VERSION 9.0.1 +ENV PYTHON_SETUPTOOLS_VERSION 34.3.3 +ENV PYTHON_WHEEL_VERSION 0.30.0a0 RUN set -ex \ && buildDeps=' \ @@ -50,7 +52,10 @@ RUN set -ex \ # we use "--force-reinstall" for the case where the version of pip we're trying to install is the same as the version bundled with Python # ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages") # https://github.com/docker-library/python/pull/143#issuecomment-241032683 - && pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \ + && pip install --no-cache-dir --upgrade --force-reinstall \ + "pip==$PYTHON_PIP_VERSION" \ + "setuptools==$PYTHON_SETUPTOOLS_VERSION" \ + "wheel==$PYTHON_WHEEL_VERSION" \ # then we use "pip list" to ensure we don't have more than one pip version installed # https://github.com/docker-library/python/pull/100 && [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \