Skip to content

Commit 8c6dcf6

Browse files
yosifkityosifkit
authored
Merge pull request docker-library#186 from mal/include-wheel
Always run pip installer to get implicit deps
2 parents 089f8ce + 60d03bd commit 8c6dcf6

25 files changed

Lines changed: 158 additions & 31 deletions

‎2.7/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13
1818

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

2224
RUN set -ex \
2325
&& buildDeps=' \
@@ -50,7 +52,10 @@ RUN set -ex \
5052
# 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
5153
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
5254
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
53-
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
55+
&& pip install --no-cache-dir --upgrade --force-reinstall \
56+
"pip==$PYTHON_PIP_VERSION" \
57+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
58+
"wheel==$PYTHON_WHEEL_VERSION" \
5459
\
5560
&& find /usr/local -depth \
5661
\( \

‎2.7/alpine/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ ENV PYTHON_VERSION 2.7.13
1616

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

2022
RUN set -ex \
2123
&& apk add --no-cache --virtual .fetch-deps \
@@ -67,7 +69,10 @@ RUN set -ex \
6769
# 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
6870
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6971
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
70-
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
72+
&& pip install --no-cache-dir --upgrade --force-reinstall \
73+
"pip==$PYTHON_PIP_VERSION" \
74+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
75+
"wheel==$PYTHON_WHEEL_VERSION" \
7176
\
7277
&& find /usr/local -depth \
7378
\( \

‎2.7/slim/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ ENV PYTHON_VERSION 2.7.13
2020

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

2426
RUN set -ex \
2527
&& buildDeps=' \
@@ -65,7 +67,10 @@ RUN set -ex \
6567
# 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
6668
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6769
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
68-
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
70+
&& pip install --no-cache-dir --upgrade --force-reinstall \
71+
"pip==$PYTHON_PIP_VERSION" \
72+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
73+
"wheel==$PYTHON_WHEEL_VERSION" \
6974
\
7075
&& find /usr/local -depth \
7176
\( \

‎2.7/wheezy/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ ENV PYTHON_VERSION 2.7.13
1818

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

2224
RUN set -ex \
2325
&& buildDeps=' \
@@ -50,7 +52,10 @@ RUN set -ex \
5052
# 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
5153
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
5254
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
53-
&& pip install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
55+
&& pip install --no-cache-dir --upgrade --force-reinstall \
56+
"pip==$PYTHON_PIP_VERSION" \
57+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
58+
"wheel==$PYTHON_WHEEL_VERSION" \
5459
\
5560
&& find /usr/local -depth \
5661
\( \

‎3.3/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.3.6
2424

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

2830
RUN set -ex \
2931
&& buildDeps=' \
@@ -59,7 +61,10 @@ RUN set -ex \
5961
# 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
6062
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6163
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
62-
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
64+
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
65+
"pip==$PYTHON_PIP_VERSION" \
66+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
67+
"wheel==$PYTHON_WHEEL_VERSION" \
6368
\
6469
&& find /usr/local -depth \
6570
\( \

‎3.3/alpine/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.3.6
2222

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

2628
RUN set -ex \
2729
&& apk add --no-cache --virtual .fetch-deps \
@@ -77,7 +79,10 @@ RUN set -ex \
7779
# 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
7880
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
7981
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
80-
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
82+
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
83+
"pip==$PYTHON_PIP_VERSION" \
84+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
85+
"wheel==$PYTHON_WHEEL_VERSION" \
8186
\
8287
&& find /usr/local -depth \
8388
\( \

‎3.3/slim/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ENV PYTHON_VERSION 3.3.6
2626

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

3032
RUN set -ex \
3133
&& buildDeps=' \
@@ -74,7 +76,10 @@ RUN set -ex \
7476
# 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
7577
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
7678
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
77-
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
79+
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
80+
"pip==$PYTHON_PIP_VERSION" \
81+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
82+
"wheel==$PYTHON_WHEEL_VERSION" \
7883
\
7984
&& find /usr/local -depth \
8085
\( \

‎3.3/wheezy/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.3.6
2424

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

2830
RUN set -ex \
2931
&& buildDeps=' \
@@ -59,7 +61,10 @@ RUN set -ex \
5961
# 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
6062
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6163
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
62-
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
64+
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
65+
"pip==$PYTHON_PIP_VERSION" \
66+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
67+
"wheel==$PYTHON_WHEEL_VERSION" \
6368
\
6469
&& find /usr/local -depth \
6570
\( \

‎3.4/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.4.6
2424

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

2830
RUN set -ex \
2931
&& buildDeps=' \
@@ -59,7 +61,10 @@ RUN set -ex \
5961
# 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
6062
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
6163
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
62-
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
64+
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
65+
"pip==$PYTHON_PIP_VERSION" \
66+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
67+
"wheel==$PYTHON_WHEEL_VERSION" \
6368
\
6469
&& find /usr/local -depth \
6570
\( \

‎3.4/alpine/Dockerfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.4.6
2222

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

2628
RUN set -ex \
2729
&& apk add --no-cache --virtual .fetch-deps \
@@ -77,7 +79,10 @@ RUN set -ex \
7779
# 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
7880
# ("Requirement already up-to-date: pip==8.1.2 in /usr/local/lib/python3.6/site-packages")
7981
# https://github.com/docker-library/python/pull/143#issuecomment-241032683
80-
&& pip3 install --no-cache-dir --upgrade --force-reinstall "pip==$PYTHON_PIP_VERSION" \
82+
&& pip3 install --no-cache-dir --upgrade --force-reinstall \
83+
"pip==$PYTHON_PIP_VERSION" \
84+
"setuptools==$PYTHON_SETUPTOOLS_VERSION" \
85+
"wheel==$PYTHON_WHEEL_VERSION" \
8186
\
8287
&& find /usr/local -depth \
8388
\( \

0 commit comments

Comments
 (0)