Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Windows 1803 variants to "golang" #4534

Merged
merged 1 commit into from
Jul 6, 2018

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 4, 2018

@yosifkit
Copy link
Member

yosifkit commented Jul 5, 2018

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 96af1f5..3e80913 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -18,6 +18,7 @@ golang:1.9-stretch @ i386
 golang:1.9-stretch @ ppc64le
 golang:1.9-stretch @ s390x
 golang:1.9-windowsservercore-1709 @ windows-amd64
+golang:1.9-windowsservercore-1803 @ windows-amd64
 golang:1.9-windowsservercore-ltsc2016 @ windows-amd64
 golang:alpine @ amd64
 golang:alpine @ arm32v6
@@ -40,6 +41,7 @@ golang:rc-stretch @ i386
 golang:rc-stretch @ ppc64le
 golang:rc-stretch @ s390x
 golang:rc-windowsservercore-1709 @ windows-amd64
+golang:rc-windowsservercore-1803 @ windows-amd64
 golang:rc-windowsservercore-ltsc2016 @ windows-amd64
 golang:stretch @ amd64
 golang:stretch @ arm32v7
@@ -48,4 +50,5 @@ golang:stretch @ i386
 golang:stretch @ ppc64le
 golang:stretch @ s390x
 golang:windowsservercore-1709 @ windows-amd64
+golang:windowsservercore-1803 @ windows-amd64
 golang:windowsservercore-ltsc2016 @ windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index d121ddb..beeca8f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,6 +6,7 @@ golang:1-nanoserver-sac2016
 golang:1-stretch
 golang:1-windowsservercore
 golang:1-windowsservercore-1709
+golang:1-windowsservercore-1803
 golang:1-windowsservercore-ltsc2016
 golang:1.9
 golang:1.9-alpine
@@ -16,6 +17,7 @@ golang:1.9-nanoserver-sac2016
 golang:1.9-stretch
 golang:1.9-windowsservercore
 golang:1.9-windowsservercore-1709
+golang:1.9-windowsservercore-1803
 golang:1.9-windowsservercore-ltsc2016
 golang:1.9.7
 golang:1.9.7-alpine
@@ -26,6 +28,7 @@ golang:1.9.7-nanoserver-sac2016
 golang:1.9.7-stretch
 golang:1.9.7-windowsservercore
 golang:1.9.7-windowsservercore-1709
+golang:1.9.7-windowsservercore-1803
 golang:1.9.7-windowsservercore-ltsc2016
 golang:1.10
 golang:1.10-alpine
@@ -35,6 +38,7 @@ golang:1.10-nanoserver-sac2016
 golang:1.10-stretch
 golang:1.10-windowsservercore
 golang:1.10-windowsservercore-1709
+golang:1.10-windowsservercore-1803
 golang:1.10-windowsservercore-ltsc2016
 golang:1.10.3
 golang:1.10.3-alpine
@@ -44,6 +48,7 @@ golang:1.10.3-nanoserver-sac2016
 golang:1.10.3-stretch
 golang:1.10.3-windowsservercore
 golang:1.10.3-windowsservercore-1709
+golang:1.10.3-windowsservercore-1803
 golang:1.10.3-windowsservercore-ltsc2016
 golang:1.11beta1
 golang:1.11beta1-alpine
@@ -53,6 +58,7 @@ golang:1.11beta1-nanoserver-sac2016
 golang:1.11beta1-stretch
 golang:1.11beta1-windowsservercore
 golang:1.11beta1-windowsservercore-1709
+golang:1.11beta1-windowsservercore-1803
 golang:1.11beta1-windowsservercore-ltsc2016
 golang:1.11-rc
 golang:1.11-rc-alpine
@@ -62,6 +68,7 @@ golang:1.11-rc-nanoserver-sac2016
 golang:1.11-rc-stretch
 golang:1.11-rc-windowsservercore
 golang:1.11-rc-windowsservercore-1709
+golang:1.11-rc-windowsservercore-1803
 golang:1.11-rc-windowsservercore-ltsc2016
 golang:alpine
 golang:alpine3.7
@@ -76,8 +83,10 @@ golang:rc-nanoserver-sac2016
 golang:rc-stretch
 golang:rc-windowsservercore
 golang:rc-windowsservercore-1709
+golang:rc-windowsservercore-1803
 golang:rc-windowsservercore-ltsc2016
 golang:stretch
 golang:windowsservercore
 golang:windowsservercore-1709
+golang:windowsservercore-1803
 golang:windowsservercore-ltsc2016
diff --git a/_bashbrew-shared-tags b/_bashbrew-shared-tags
index 6357f51..b2d3ef7 100644
--- a/_bashbrew-shared-tags
+++ b/_bashbrew-shared-tags
@@ -1,27 +1,27 @@
-golang:1 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
+golang:1 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
 golang:1-nanoserver -- golang:nanoserver-sac2016
-golang:1-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
-golang:1.9 -- golang:1.9-stretch, golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709
+golang:1-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
+golang:1.9 -- golang:1.9-stretch, golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709, golang:1.9-windowsservercore-1803
 golang:1.9-nanoserver -- golang:1.9-nanoserver-sac2016
-golang:1.9-windowsservercore -- golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709
-golang:1.9.7 -- golang:1.9-stretch, golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709
+golang:1.9-windowsservercore -- golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709, golang:1.9-windowsservercore-1803
+golang:1.9.7 -- golang:1.9-stretch, golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709, golang:1.9-windowsservercore-1803
 golang:1.9.7-nanoserver -- golang:1.9-nanoserver-sac2016
-golang:1.9.7-windowsservercore -- golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709
-golang:1.10 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
+golang:1.9.7-windowsservercore -- golang:1.9-windowsservercore-ltsc2016, golang:1.9-windowsservercore-1709, golang:1.9-windowsservercore-1803
+golang:1.10 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
 golang:1.10-nanoserver -- golang:nanoserver-sac2016
-golang:1.10-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
-golang:1.10.3 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
+golang:1.10-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
+golang:1.10.3 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
 golang:1.10.3-nanoserver -- golang:nanoserver-sac2016
-golang:1.10.3-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
-golang:1.11beta1 -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709
+golang:1.10.3-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
+golang:1.11beta1 -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803
 golang:1.11beta1-nanoserver -- golang:rc-nanoserver-sac2016
-golang:1.11beta1-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709
-golang:1.11-rc -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709
+golang:1.11beta1-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803
+golang:1.11-rc -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803
 golang:1.11-rc-nanoserver -- golang:rc-nanoserver-sac2016
-golang:1.11-rc-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709
-golang:latest -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
+golang:1.11-rc-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803
+golang:latest -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
 golang:nanoserver -- golang:nanoserver-sac2016
-golang:rc -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709
+golang:rc -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803
 golang:rc-nanoserver -- golang:rc-nanoserver-sac2016
-golang:rc-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709
-golang:windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709
+golang:rc-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803
+golang:windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803
diff --git a/golang_1.9-windowsservercore-1709/Dockerfile b/golang_1.9-windowsservercore-1803/Dockerfile
similarity index 98%
copy from golang_1.9-windowsservercore-1709/Dockerfile
copy to golang_1.9-windowsservercore-1803/Dockerfile
index f49e3a5..4474050 100644
--- a/golang_1.9-windowsservercore-1709/Dockerfile
+++ b/golang_1.9-windowsservercore-1803/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:1709
+FROM microsoft/windowsservercore:1803
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/golang_rc-windowsservercore-1709/Dockerfile b/golang_rc-windowsservercore-1803/Dockerfile
similarity index 98%
copy from golang_rc-windowsservercore-1709/Dockerfile
copy to golang_rc-windowsservercore-1803/Dockerfile
index 7046c75..20ada2d 100644
--- a/golang_rc-windowsservercore-1709/Dockerfile
+++ b/golang_rc-windowsservercore-1803/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:1709
+FROM microsoft/windowsservercore:1803
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/golang_windowsservercore-1709/Dockerfile b/golang_windowsservercore-1803/Dockerfile
similarity index 98%
copy from golang_windowsservercore-1709/Dockerfile
copy to golang_windowsservercore-1803/Dockerfile
index 4411203..f1ae6de 100644
--- a/golang_windowsservercore-1709/Dockerfile
+++ b/golang_windowsservercore-1803/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:1709
+FROM microsoft/windowsservercore:1803
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

@yosifkit yosifkit merged commit 8a4e14f into docker-library:master Jul 6, 2018
@yosifkit yosifkit deleted the update-docker-library branch July 6, 2018 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants