Skip to content

Commit d69548e

Browse files
malmal
committed
Run update.sh
1 parent ffe1b5c commit d69548e

File tree

14 files changed

+84
-14
lines changed

14 files changed

+84
-14
lines changed

‎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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
6469
# https://github.com/docker-library/python/pull/100
6570
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
8287
# https://github.com/docker-library/python/pull/100
8388
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
7984
# https://github.com/docker-library/python/pull/100
8085
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
6469
# https://github.com/docker-library/python/pull/100
6570
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
6469
# https://github.com/docker-library/python/pull/100
6570
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
8287
# https://github.com/docker-library/python/pull/100
8388
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.4/slim/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ENV PYTHON_VERSION 3.4.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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
7984
# https://github.com/docker-library/python/pull/100
8085
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.4/wheezy/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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
6469
# https://github.com/docker-library/python/pull/100
6570
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.5/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.5.3
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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
6469
# https://github.com/docker-library/python/pull/100
6570
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.5/alpine/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.5.3
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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
8287
# https://github.com/docker-library/python/pull/100
8388
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.5/slim/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ENV PYTHON_VERSION 3.5.3
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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
7984
# https://github.com/docker-library/python/pull/100
8085
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.6/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ENV PYTHON_VERSION 3.6.1
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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
6469
# https://github.com/docker-library/python/pull/100
6570
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.6/alpine/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ENV PYTHON_VERSION 3.6.1
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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
8287
# https://github.com/docker-library/python/pull/100
8388
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

‎3.6/slim/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ENV PYTHON_VERSION 3.6.1
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 34.3.3
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
# then we use "pip list" to ensure we don't have more than one pip version installed
7984
# https://github.com/docker-library/python/pull/100
8085
&& [ "$(pip list |tac|tac| awk -F '[ ()]+' '$1 == "pip" { print $2; exit }')" = "$PYTHON_PIP_VERSION" ] \

0 commit comments

Comments
 (0)