Merge pull request #116 from francislavoie/fix-windows-builder

Fix FROM for windows builder
caddyserver · Sep 17, 2020 · edea053 · edea053
2 parents 390abaf + da426b8
commit edea053
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/2.1/windows-builder/1809/Dockerfile b/2.1/windows-builder/1809/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14
+FROM golang:1.14-windowsservercore-1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.1/windows-builder/1809/Dockerfile.base b/2.1/windows-builder/1809/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.14
+FROM golang:1.14-windowsservercore-1809
diff --git a/2.1/windows-builder/ltsc2016/Dockerfile b/2.1/windows-builder/ltsc2016/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14
+FROM golang:1.14-windowsservercore-ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.1/windows-builder/ltsc2016/Dockerfile.base b/2.1/windows-builder/ltsc2016/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.14
+FROM golang:1.14-windowsservercore-ltsc2016
diff --git a/2.2/windows-builder/1809/Dockerfile b/2.2/windows-builder/1809/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15
+FROM golang:1.15-windowsservercore-1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.2/windows-builder/1809/Dockerfile.base b/2.2/windows-builder/1809/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.15
+FROM golang:1.15-windowsservercore-1809
diff --git a/2.2/windows-builder/ltsc2016/Dockerfile b/2.2/windows-builder/ltsc2016/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15
+FROM golang:1.15-windowsservercore-ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.2/windows-builder/ltsc2016/Dockerfile.base b/2.2/windows-builder/ltsc2016/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.15
+FROM golang:1.15-windowsservercore-ltsc2016
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM golang:1.14
		FROM golang:1.14-windowsservercore-1809
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM golang:1.14
		FROM golang:1.14-windowsservercore-ltsc2016
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM golang:1.15
		FROM golang:1.15-windowsservercore-1809
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM golang:1.15
		FROM golang:1.15-windowsservercore-ltsc2016