Skip to content

Commit

Permalink
Merge pull request docker-library#186 from mal/include-wheel
Browse files Browse the repository at this point in the history
Always run pip installer to get implicit deps
  • Loading branch information
yosifkit authored Apr 25, 2017
2 parents ae6d5c6 + 4b7e501 commit ac845df
Show file tree
Hide file tree
Showing 25 changed files with 158 additions and 31 deletions.
7 changes: 6 additions & 1 deletion 2.7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -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" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 2.7/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -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" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 2.7/slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -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" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 2.7/wheezy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -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" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.3.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -59,7 +61,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.3.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -77,7 +79,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.3/slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ ENV PYTHON_VERSION 3.3.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -74,7 +76,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.3/wheezy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.3.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -59,7 +61,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.4.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -59,7 +61,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.4/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.4.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -77,7 +79,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.4/slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ ENV PYTHON_VERSION 3.4.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -74,7 +76,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.4/wheezy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.4.6

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -59,7 +61,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.5.3

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -59,7 +61,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.5/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.5.3

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -77,7 +79,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.5/slim/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ ENV PYTHON_VERSION 3.5.3

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -74,7 +76,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
12 changes: 9 additions & 3 deletions 3.5/windows/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ ENV PYTHON_RELEASE 3.5.3

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
Write-Host ('Downloading {0} ...' -f $url); \
Expand Down Expand Up @@ -40,12 +42,16 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
Write-Host 'Removing ...'; \
Remove-Item python.exe -Force; \
\
$pipInstall = ('pip=={0}' -f $env:PYTHON_PIP_VERSION); \
Write-Host ('Installing {0} ...' -f $pipInstall); \
Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
# 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 $pipInstall; \
# (using "python -m pip" instead of "pip" to avoid pip trying to remove itself while it's running; see also https://pip.readthedocs.io/en/stable/installing/#id6)
python -m pip install --no-cache-dir --upgrade --force-reinstall \
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
('setuptools=={0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \
('wheel=={0}' -f $env:PYTHON_WHEEL_VERSION) \
; \
\
Write-Host 'Verifying pip install ...'; \
pip --version; \
Expand Down
7 changes: 6 additions & 1 deletion 3.6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.6.1

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& buildDeps=' \
Expand Down Expand Up @@ -59,7 +61,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
7 changes: 6 additions & 1 deletion 3.6/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.6.1

# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
ENV PYTHON_PIP_VERSION 9.0.1
ENV PYTHON_SETUPTOOLS_VERSION 35.0.1
ENV PYTHON_WHEEL_VERSION 0.29.0

RUN set -ex \
&& apk add --no-cache --virtual .fetch-deps \
Expand Down Expand Up @@ -77,7 +79,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
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
"pip==$PYTHON_PIP_VERSION" \
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
"wheel==$PYTHON_WHEEL_VERSION" \
\
&& find /usr/local -depth \
\( \
Expand Down
Loading

0 comments on commit ac845df

Please sign in to comment.