Apply more bits from docker-library/golang#257

tianon · tianon · commit 9fd50c0bc846 · 2019-02-14T16:10:56.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,37 +1,77 @@
 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
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -78,8 +78,7 @@ for version in "${versions[@]}"; do
 	for v in \
 		{stretch,jessie,wheezy}{,/slim} \
 		alpine{3.9,3.8} \
-		windows/windowsservercore-{ltsc2016,1709} \
-		windows/nanoserver-{sac2016,1709} \
+		windows/windowsservercore-{ltsc2016,1709,1803,1809} \
 	; do
 		dir="$version/$v"
 		variant="$(basename "$v")"
diff --git a/update.sh b/update.sh
@@ -114,7 +114,6 @@ for version in "${versions[@]}"; do
 	for v in \
 		alpine{3.8,3.9} \
 		{wheezy,jessie,stretch}{/slim,} \
-		windows/nanoserver-{1709,sac2016} \
 		windows/windowsservercore-{1809,1803,1709,ltsc2016} \
 	; do
 		dir="$version/$v"
@@ -145,7 +144,7 @@ for version in "${versions[@]}"; do
 			-e 's/^(ENV PYTHON_RELEASE) .*/\1 '"${fullVersion%%[a-z]*}"'/' \
 			-e 's/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/' \
 			-e 's/^(FROM python):.*/\1:'"$version-$tag"'/' \
-			-e 's!^(FROM (debian|buildpack-deps|alpine|[^/]+/windows/[^:]+)):.*!\1:'"$tag"'!' \
+			-e 's!^(FROM (debian|buildpack-deps|alpine|mcr[.]microsoft[.]com/[^:]+)):.*!\1:'"$tag"'!' \
 			"$dir/Dockerfile"
 
 		case "$variant" in
@@ -198,19 +197,24 @@ for version in "${versions[@]}"; do
 		esac
 
 		case "$v" in
-			windows/*-1803) ;; # TODO
-			windows/*-1709|windows/*-1809) ;; # no AppVeyor support for 1709 or 1809 yet: https://github.com/appveyor/ci/issues/1885 and https://github.com/appveyor/ci/issues/2676
+			windows/*-1803)
+				travisEnv='\n    - os: windows\n      dist: 1803-containers\n      env: VERSION='"$version VARIANT=$v$travisEnv"
+				;;
+
+			windows/*-1709 | windows/*-1809) ;; # no AppVeyor support for 1709 or 1809 yet: https://github.com/appveyor/ci/issues/1885 and https://github.com/appveyor/ci/issues/2676
+
 			windows/*)
 				appveyorEnv='\n    - version: '"$version"'\n      variant: '"$variant$appveyorEnv"
 				;;
+
 			*)
-				travisEnv='\n  - VERSION='"$version VARIANT=$v$travisEnv"
+				travisEnv='\n    - os: linux\n      env: VERSION='"$version VARIANT=$v$travisEnv"
 				;;
 		esac
 	done
 done
 
-travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
+travis="$(awk -v 'RS=\n\n' '$1 == "matrix:" { $0 = "matrix:\n  include:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
 echo "$travis" > .travis.yml
 
 appveyor="$(awk -v 'RS=\n\n' '$1 == "environment:" { $0 = "environment:\n  matrix:'"$appveyorEnv"'" } { printf "%s%s", $0, RS }' .appveyor.yml)"
