Skip to content

Commit ca96580

Browse files
malmal
committed
Update 2.7 manually
1 parent d69548e commit ca96580

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

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

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

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

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

0 commit comments

Comments
 (0)