Merge pull request docker-library#279 from infosiftr/more-win-tls

yosifkit · web-flow · commit fc39f75824c0 · 2018-04-26T09:29:44.000-07:00
Python.org also now needs tls 1.2
diff --git a/2.7/windows/windowsservercore-1709/Dockerfile b/2.7/windows/windowsservercore-1709/Dockerfile
@@ -7,6 +7,7 @@ ENV PYTHON_RELEASE 2.7.14
 
 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'python.msi'; \
 	\
 	Write-Host 'Installing ...'; \
diff --git a/2.7/windows/windowsservercore-ltsc2016/Dockerfile b/2.7/windows/windowsservercore-ltsc2016/Dockerfile
@@ -7,6 +7,7 @@ ENV PYTHON_RELEASE 2.7.14
 
 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'python.msi'; \
 	\
 	Write-Host 'Installing ...'; \
diff --git a/3.6/windows/windowsservercore-1709/Dockerfile b/3.6/windows/windowsservercore-1709/Dockerfile
@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.6.5
 
 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); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
 	\
 	Write-Host 'Installing ...'; \
diff --git a/3.6/windows/windowsservercore-ltsc2016/Dockerfile b/3.6/windows/windowsservercore-ltsc2016/Dockerfile
@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.6.5
 
 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); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
 	\
 	Write-Host 'Installing ...'; \
diff --git a/3.7-rc/windows/windowsservercore-1709/Dockerfile b/3.7-rc/windows/windowsservercore-1709/Dockerfile
@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.7.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); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
 	\
 	Write-Host 'Installing ...'; \
diff --git a/3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile b/3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile
@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.7.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); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
 	\
 	Write-Host 'Installing ...'; \
diff --git a/Dockerfile-windowsservercore.template b/Dockerfile-windowsservercore.template
@@ -7,6 +7,7 @@ ENV PYTHON_RELEASE %%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); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
 	\
 	Write-Host 'Installing ...'; \

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ ENV PYTHON_RELEASE 2.7.14`
`7`	`7`
`8`	`8`	`RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \`
`9`	`9`	`Write-Host ('Downloading {0} ...' -f $url); \`
	`10`	`+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \`
`10`	`11`	`Invoke-WebRequest -Uri $url -OutFile 'python.msi'; \`
`11`	`12`	`\`
`12`	`13`	`Write-Host 'Installing ...'; \`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.6.5`
`13`	`13`
`14`	`14`	`RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \`
`15`	`15`	`Write-Host ('Downloading {0} ...' -f $url); \`
	`16`	`+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \`
`16`	`17`	`Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \`
`17`	`18`	`\`
`18`	`19`	`Write-Host 'Installing ...'; \`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ ENV PYTHON_RELEASE %%PLACEHOLDER%%`
`7`	`7`
`8`	`8`	`RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \`
`9`	`9`	`Write-Host ('Downloading {0} ...' -f $url); \`
	`10`	`+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \`
`10`	`11`	`Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \`
`11`	`12`	`\`
`12`	`13`	`Write-Host 'Installing ...'; \`