docker-library · tianon · Feb 15, 2019 · Feb 11, 2019 · Feb 11, 2019 · Feb 11, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,44 +1,84 @@
 language: bash
 services: docker
 
-env:
-  - VERSION=3.7 VARIANT=stretch
-  - VERSION=3.7 VARIANT=stretch/slim
-  - VERSION=3.7 VARIANT=alpine3.9
-  - VERSION=3.7 VARIANT=alpine3.8
-  - VERSION=3.6 VARIANT=stretch
-  - VERSION=3.6 VARIANT=stretch/slim
-  - VERSION=3.6 VARIANT=jessie
-  - VERSION=3.6 VARIANT=jessie/slim
-  - VERSION=3.6 VARIANT=alpine3.9
-  - VERSION=3.6 VARIANT=alpine3.8
-  - VERSION=3.5 VARIANT=stretch
-  - VERSION=3.5 VARIANT=stretch/slim
-  - VERSION=3.5 VARIANT=jessie
-  - VERSION=3.5 VARIANT=jessie/slim
-  - VERSION=3.5 VARIANT=alpine3.9
-  - VERSION=3.5 VARIANT=alpine3.8
-  - VERSION=3.4 VARIANT=stretch
-  - VERSION=3.4 VARIANT=stretch/slim
-  - VERSION=3.4 VARIANT=jessie
-  - VERSION=3.4 VARIANT=jessie/slim
-  - VERSION=3.4 VARIANT=wheezy
-  - VERSION=3.4 VARIANT=alpine3.9
-  - VERSION=3.4 VARIANT=alpine3.8
-  - VERSION=2.7 VARIANT=stretch
-  - VERSION=2.7 VARIANT=stretch/slim
-  - VERSION=2.7 VARIANT=jessie
-  - VERSION=2.7 VARIANT=jessie/slim
-  - VERSION=2.7 VARIANT=wheezy
-  - VERSION=2.7 VARIANT=alpine3.9
-  - VERSION=2.7 VARIANT=alpine3.8
+matrix:
+  include:
+    - os: windows
+      dist: 1803-containers
+      env: VERSION=3.7 VARIANT=windows/windowsservercore-1803
+    - os: linux
+      env: VERSION=3.7 VARIANT=stretch
+    - os: linux
+      env: VERSION=3.7 VARIANT=stretch/slim
+    - os: linux
+      env: VERSION=3.7 VARIANT=alpine3.9
+    - os: linux
+      env: VERSION=3.7 VARIANT=alpine3.8
+    - os: windows
+      dist: 1803-containers
+      env: VERSION=3.6 VARIANT=windows/windowsservercore-1803
+    - os: linux
+      env: VERSION=3.6 VARIANT=stretch
+    - os: linux
+      env: VERSION=3.6 VARIANT=stretch/slim
+    - os: linux
+      env: VERSION=3.6 VARIANT=jessie
+    - os: linux
+      env: VERSION=3.6 VARIANT=jessie/slim
+    - os: linux
+      env: VERSION=3.6 VARIANT=alpine3.9
+    - os: linux
+      env: VERSION=3.6 VARIANT=alpine3.8
+    - os: linux
+      env: VERSION=3.5 VARIANT=stretch
+    - os: linux
+      env: VERSION=3.5 VARIANT=stretch/slim
+    - os: linux
+      env: VERSION=3.5 VARIANT=jessie
+    - os: linux
+      env: VERSION=3.5 VARIANT=jessie/slim
+    - os: linux
+      env: VERSION=3.5 VARIANT=alpine3.9
+    - os: linux
+      env: VERSION=3.5 VARIANT=alpine3.8
+    - os: linux
+      env: VERSION=3.4 VARIANT=stretch
+    - os: linux
+      env: VERSION=3.4 VARIANT=stretch/slim
+    - os: linux
+      env: VERSION=3.4 VARIANT=jessie
+    - os: linux
+      env: VERSION=3.4 VARIANT=jessie/slim
+    - os: linux
+      env: VERSION=3.4 VARIANT=wheezy
+    - os: linux
+      env: VERSION=3.4 VARIANT=alpine3.9
+    - os: linux
+      env: VERSION=3.4 VARIANT=alpine3.8
+    - os: windows
+      dist: 1803-containers
+      env: VERSION=2.7 VARIANT=windows/windowsservercore-1803
+    - os: linux
+      env: VERSION=2.7 VARIANT=stretch
+    - os: linux
+      env: VERSION=2.7 VARIANT=stretch/slim
+    - os: linux
+      env: VERSION=2.7 VARIANT=jessie
+    - os: linux
+      env: VERSION=2.7 VARIANT=jessie/slim
+    - os: linux
+      env: VERSION=2.7 VARIANT=wheezy
+    - os: linux
+      env: VERSION=2.7 VARIANT=alpine3.9
+    - os: linux
+      env: VERSION=2.7 VARIANT=alpine3.8
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
+  - if [ "$TRAVIS_OS_NAME" = 'linux' ]; then wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash; fi
 
 before_script:
   - env | sort
-  - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
   - cd "$VERSION/$VARIANT"
   - slash='/'; image="python:${VERSION}-${VARIANT//$slash/-}"
 

diff --git a/2.7/windows/windowsservercore-1709/Dockerfile b/2.7/windows/windowsservercore-1709/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM microsoft/windowsservercore:1709
+FROM mcr.microsoft.com/windows/servercore:1709
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.7/windows/windowsservercore-1803/Dockerfile b/2.7/windows/windowsservercore-1803/Dockerfile
@@ -0,0 +1,64 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1803
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV PYTHON_VERSION 2.7.15
+ENV PYTHON_RELEASE 2.7.15
+
+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 ...'; \
+# https://www.python.org/download/releases/2.4/msi/
+	Start-Process msiexec -Wait \
+		-ArgumentList @( \
+			'/i', \
+			'python.msi', \
+			'/quiet', \
+			'/qn', \
+			'TARGETDIR=C:\Python', \
+			'ALLUSERS=1', \
+			'ADDLOCAL=DefaultFeature,Extensions,TclTk,Tools,PrependPath' \
+		); \
+	\
+# the installer updated PATH, so we should refresh our local value
+	$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
+	\
+	Write-Host 'Verifying install ...'; \
+	Write-Host '  python --version'; python --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item python.msi -Force; \
+	\
+	Write-Host 'Complete.';
+
+# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+ENV PYTHON_PIP_VERSION 19.0.2
+
+RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
+	python get-pip.py \
+		--disable-pip-version-check \
+		--no-cache-dir \
+		('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
+	; \
+	Remove-Item get-pip.py -Force; \
+	\
+	Write-Host 'Verifying pip install ...'; \
+	pip --version; \
+	\
+	Write-Host 'Complete.';
+
+# install "virtualenv", since the vast majority of users of this image will want it
+RUN pip install --no-cache-dir virtualenv
+
+CMD ["python"]
diff --git a/2.7/windows/windowsservercore-1809/Dockerfile b/2.7/windows/windowsservercore-1809/Dockerfile
@@ -0,0 +1,64 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1809
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV PYTHON_VERSION 2.7.15
+ENV PYTHON_RELEASE 2.7.15
+
+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 ...'; \
+# https://www.python.org/download/releases/2.4/msi/
+	Start-Process msiexec -Wait \
+		-ArgumentList @( \
+			'/i', \
+			'python.msi', \
+			'/quiet', \
+			'/qn', \
+			'TARGETDIR=C:\Python', \
+			'ALLUSERS=1', \
+			'ADDLOCAL=DefaultFeature,Extensions,TclTk,Tools,PrependPath' \
+		); \
+	\
+# the installer updated PATH, so we should refresh our local value
+	$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
+	\
+	Write-Host 'Verifying install ...'; \
+	Write-Host '  python --version'; python --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item python.msi -Force; \
+	\
+	Write-Host 'Complete.';
+
+# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+ENV PYTHON_PIP_VERSION 19.0.2
+
+RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
+	python get-pip.py \
+		--disable-pip-version-check \
+		--no-cache-dir \
+		('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
+	; \
+	Remove-Item get-pip.py -Force; \
+	\
+	Write-Host 'Verifying pip install ...'; \
+	pip --version; \
+	\
+	Write-Host 'Complete.';
+
+# install "virtualenv", since the vast majority of users of this image will want it
+RUN pip install --no-cache-dir virtualenv
+
+CMD ["python"]
diff --git a/2.7/windows/windowsservercore-ltsc2016/Dockerfile b/2.7/windows/windowsservercore-ltsc2016/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM microsoft/windowsservercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/3.6/windows/windowsservercore-1709/Dockerfile b/3.6/windows/windowsservercore-1709/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM microsoft/windowsservercore:1709
+FROM mcr.microsoft.com/windows/servercore:1709
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/3.6/windows/windowsservercore-1803/Dockerfile b/3.6/windows/windowsservercore-1803/Dockerfile
@@ -0,0 +1,62 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1803
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV PYTHON_VERSION 3.6.8
+ENV PYTHON_RELEASE 3.6.8
+
+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 ...'; \
+# https://docs.python.org/3.5/using/windows.html#installing-without-ui
+	Start-Process python.exe -Wait \
+		-ArgumentList @( \
+			'/quiet', \
+			'InstallAllUsers=1', \
+			'TargetDir=C:\Python', \
+			'PrependPath=1', \
+			'Shortcuts=0', \
+			'Include_doc=0', \
+			'Include_pip=0', \
+			'Include_test=0' \
+		); \
+	\
+# the installer updated PATH, so we should refresh our local value
+	$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
+	\
+	Write-Host 'Verifying install ...'; \
+	Write-Host '  python --version'; python --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item python.exe -Force; \
+	\
+	Write-Host 'Complete.';
+
+# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+ENV PYTHON_PIP_VERSION 19.0.2
+
+RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
+	python get-pip.py \
+		--disable-pip-version-check \
+		--no-cache-dir \
+		('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
+	; \
+	Remove-Item get-pip.py -Force; \
+	\
+	Write-Host 'Verifying pip install ...'; \
+	pip --version; \
+	\
+	Write-Host 'Complete.';
+
+CMD ["python"]
diff --git a/3.6/windows/windowsservercore-1809/Dockerfile b/3.6/windows/windowsservercore-1809/Dockerfile
@@ -0,0 +1,62 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1809
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV PYTHON_VERSION 3.6.8
+ENV PYTHON_RELEASE 3.6.8
+
+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 ...'; \
+# https://docs.python.org/3.5/using/windows.html#installing-without-ui
+	Start-Process python.exe -Wait \
+		-ArgumentList @( \
+			'/quiet', \
+			'InstallAllUsers=1', \
+			'TargetDir=C:\Python', \
+			'PrependPath=1', \
+			'Shortcuts=0', \
+			'Include_doc=0', \
+			'Include_pip=0', \
+			'Include_test=0' \
+		); \
+	\
+# the installer updated PATH, so we should refresh our local value
+	$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
+	\
+	Write-Host 'Verifying install ...'; \
+	Write-Host '  python --version'; python --version; \
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item python.exe -Force; \
+	\
+	Write-Host 'Complete.';
+
+# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+ENV PYTHON_PIP_VERSION 19.0.2
+
+RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
+	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+	Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
+	python get-pip.py \
+		--disable-pip-version-check \
+		--no-cache-dir \
+		('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
+	; \
+	Remove-Item get-pip.py -Force; \
+	\
+	Write-Host 'Verifying pip install ...'; \
+	pip --version; \
+	\
+	Write-Host 'Complete.';
+
+CMD ["python"]