Update 2.7 manually

mal · tianon · commit 05db1fffa8c3 · 2017-04-25T15:19:47.000-07:00
diff --git 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 '<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=' \
@@ -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 \
 		\( \
diff --git 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 '<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 \
@@ -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 \
 		\( \
diff --git 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 '<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=' \
@@ -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 \
 		\( \
diff --git 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 '<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=' \
@@ -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 \
 		\( \
