Fix "pip" installation/upgrade on Windows and apply the same setuptools/wheel behavior there

tianon · tianon · commit 60d03bd670bb · 2017-04-25T15:32:42.000-07:00
diff --git a/3.5/windows/windowsservercore/Dockerfile b/3.5/windows/windowsservercore/Dockerfile
@@ -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); \
@@ -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; \
diff --git a/3.6/windows/windowsservercore/Dockerfile b/3.6/windows/windowsservercore/Dockerfile
@@ -13,6 +13,8 @@ ENV PYTHON_RELEASE 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 $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); \
@@ -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; \
diff --git a/Dockerfile-windowsservercore.template b/Dockerfile-windowsservercore.template
@@ -7,6 +7,8 @@ ENV PYTHON_RELEASE %%PLACEHOLDER%%
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION %%PLACEHOLDER%%
+ENV PYTHON_SETUPTOOLS_VERSION %%PLACEHOLDER%%
+ENV PYTHON_WHEEL_VERSION %%PLACEHOLDER%%
 
 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); \
@@ -34,12 +36,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; \
