fix windows images

andyli · Jun 14, 2019 · 5253ae4 · 5253ae4
1 parent cbdd066
commit 5253ae4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 18 deletions.
diff --git a/3.1/windowsservercore/Dockerfile → 3.1/windowsservercore-ltsc2016/Dockerfile b/3.1/windowsservercore/Dockerfile → 3.1/windowsservercore-ltsc2016/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM microsoft/windowsservercore
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 

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

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

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

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

diff --git a/Dockerfile-windowsservercore.template → ...rfile-windowsservercore-ltsc2016.template b/Dockerfile-windowsservercore.template → ...rfile-windowsservercore-ltsc2016.template
@@ -1,6 +1,6 @@
 ::HEADER::
 
-FROM microsoft/windowsservercore
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
 

diff --git a/Update.hx b/Update.hx
@@ -72,8 +72,8 @@ class Update {
 			"suffix": ["onbuild"]
 		},
 		{
-			"variant": "windowsservercore",
-			"suffix": ["windowsservercore"]
+			"variant": "windowsservercore-ltsc2016",
+			"suffix": ["windowsservercore-ltsc2016", "windowsservercore"]
 		},
 		// neko and haxelib are still 32-bit only
 		// {
@@ -130,21 +130,21 @@ class Update {
 					HAXE_VERSION: version.version,
 					HAXE_TAG: version.tag,
 					HAXE_FILE: switch(variant.variant) {
-						case "windowsservercore"|"nanoserver":
+						case "windowsservercore-ltsc2016"|"nanoserver":
 							'https://github.com/HaxeFoundation/haxe/releases/download/${version.tag}/haxe-${version.version}-win${version.win64 ? "64" : ""}.zip';
 						case _:
 							null;
 					},
 					HAXE_SHA256: switch(variant.variant) {
-						case "windowsservercore"|"nanoserver":
+						case "windowsservercore-ltsc2016"|"nanoserver":
 							version.sha256.win;
 						case _:
 							null;
 					},
 					NEKO_VERSION: "2.2.0",
 					NEKO_TAG: "v2-2-0",
 					NEKO_SHA256: switch(variant.variant) {
-						case "windowsservercore"|"nanoserver":
+						case "windowsservercore-ltsc2016"|"nanoserver":
 							"93d7ca96698a6825f38ca8eea49e2e6b691c0849270174f6c1bd531290db8d69";
 						case _:
 							"cf101ca05db6cb673504efe217d8ed7ab5638f30e12c5e3095f06fa0d43f64e3";

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,18 +3,16 @@ image: Visual Studio 2017
 
 environment:
   matrix:
-    # - version: 3.4
-    #   variant: nanoserver
     - version: 4.0
-      variant: windowsservercore
+      variant: windowsservercore-ltsc2016
     - version: 3.4
-      variant: windowsservercore
+      variant: windowsservercore-ltsc2016
     - version: 3.3
-      variant: windowsservercore
+      variant: windowsservercore-ltsc2016
     - version: 3.2
-      variant: windowsservercore
+      variant: windowsservercore-ltsc2016
     - version: 3.1
-      variant: windowsservercore
+      variant: windowsservercore-ltsc2016
 
 install:
   - ps: |