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

Update Go to 1.12 (GA) #5473

Merged
merged 1 commit into from
Feb 26, 2019
Merged

Update Go to 1.12 (GA) #5473

merged 1 commit into from
Feb 26, 2019

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 26, 2019

@rodrigo-brito

This comment has been minimized.

@tianon

This comment has been minimized.

@sylr

This comment has been minimized.

Copy link
Contributor

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks.

@tianon
Copy link
Member Author

tianon commented Feb 26, 2019

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 224c43b..60baabd 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,32 +1,26 @@
-golang:1.10-alpine3.8 @ amd64
-golang:1.10-alpine3.8 @ arm32v6
-golang:1.10-alpine3.8 @ arm64v8
-golang:1.10-alpine3.8 @ i386
-golang:1.10-alpine3.8 @ ppc64le
-golang:1.10-alpine3.8 @ s390x
-golang:1.10-alpine @ amd64
-golang:1.10-alpine @ arm32v6
-golang:1.10-alpine @ arm64v8
-golang:1.10-alpine @ i386
-golang:1.10-alpine @ ppc64le
-golang:1.10-alpine @ s390x
-golang:1.10-nanoserver-sac2016 @ windows-amd64
-golang:1.10-stretch @ amd64
-golang:1.10-stretch @ arm32v7
-golang:1.10-stretch @ arm64v8
-golang:1.10-stretch @ i386
-golang:1.10-stretch @ ppc64le
-golang:1.10-stretch @ s390x
-golang:1.10-windowsservercore-1709 @ windows-amd64
-golang:1.10-windowsservercore-1803 @ windows-amd64
-golang:1.10-windowsservercore-1809 @ windows-amd64
-golang:1.10-windowsservercore-ltsc2016 @ windows-amd64
-golang:alpine3.8 @ amd64
-golang:alpine3.8 @ arm32v6
-golang:alpine3.8 @ arm64v8
-golang:alpine3.8 @ i386
-golang:alpine3.8 @ ppc64le
-golang:alpine3.8 @ s390x
+golang:1.11-alpine3.8 @ amd64
+golang:1.11-alpine3.8 @ arm32v6
+golang:1.11-alpine3.8 @ arm64v8
+golang:1.11-alpine3.8 @ i386
+golang:1.11-alpine3.8 @ ppc64le
+golang:1.11-alpine3.8 @ s390x
+golang:1.11-alpine @ amd64
+golang:1.11-alpine @ arm32v6
+golang:1.11-alpine @ arm64v8
+golang:1.11-alpine @ i386
+golang:1.11-alpine @ ppc64le
+golang:1.11-alpine @ s390x
+golang:1.11-nanoserver-sac2016 @ windows-amd64
+golang:1.11-stretch @ amd64
+golang:1.11-stretch @ arm32v7
+golang:1.11-stretch @ arm64v8
+golang:1.11-stretch @ i386
+golang:1.11-stretch @ ppc64le
+golang:1.11-stretch @ s390x
+golang:1.11-windowsservercore-1709 @ windows-amd64
+golang:1.11-windowsservercore-1803 @ windows-amd64
+golang:1.11-windowsservercore-1809 @ windows-amd64
+golang:1.11-windowsservercore-ltsc2016 @ windows-amd64
 golang:alpine @ amd64
 golang:alpine @ arm32v6
 golang:alpine @ arm64v8
@@ -34,29 +28,6 @@ golang:alpine @ i386
 golang:alpine @ ppc64le
 golang:alpine @ s390x
 golang:nanoserver-sac2016 @ windows-amd64
-golang:rc-alpine3.8 @ amd64
-golang:rc-alpine3.8 @ arm32v6
-golang:rc-alpine3.8 @ arm64v8
-golang:rc-alpine3.8 @ i386
-golang:rc-alpine3.8 @ ppc64le
-golang:rc-alpine3.8 @ s390x
-golang:rc-alpine @ amd64
-golang:rc-alpine @ arm32v6
-golang:rc-alpine @ arm64v8
-golang:rc-alpine @ i386
-golang:rc-alpine @ ppc64le
-golang:rc-alpine @ s390x
-golang:rc-nanoserver-sac2016 @ windows-amd64
-golang:rc-stretch @ amd64
-golang:rc-stretch @ arm32v7
-golang:rc-stretch @ arm64v8
-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-1809 @ windows-amd64
-golang:rc-windowsservercore-ltsc2016 @ windows-amd64
 golang:stretch @ amd64
 golang:stretch @ arm32v7
 golang:stretch @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index ecdae77..05b108b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,5 @@
 golang:1
 golang:1-alpine
-golang:1-alpine3.8
 golang:1-alpine3.9
 golang:1-nanoserver
 golang:1-nanoserver-sac2016
@@ -10,30 +9,6 @@ golang:1-windowsservercore-1709
 golang:1-windowsservercore-1803
 golang:1-windowsservercore-1809
 golang:1-windowsservercore-ltsc2016
-golang:1.10
-golang:1.10-alpine
-golang:1.10-alpine3.8
-golang:1.10-alpine3.9
-golang:1.10-nanoserver
-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-1809
-golang:1.10-windowsservercore-ltsc2016
-golang:1.10.8
-golang:1.10.8-alpine
-golang:1.10.8-alpine3.8
-golang:1.10.8-alpine3.9
-golang:1.10.8-nanoserver
-golang:1.10.8-nanoserver-sac2016
-golang:1.10.8-stretch
-golang:1.10.8-windowsservercore
-golang:1.10.8-windowsservercore-1709
-golang:1.10.8-windowsservercore-1803
-golang:1.10.8-windowsservercore-1809
-golang:1.10.8-windowsservercore-ltsc2016
 golang:1.11
 golang:1.11-alpine
 golang:1.11-alpine3.8
@@ -58,48 +33,33 @@ golang:1.11.5-windowsservercore-1709
 golang:1.11.5-windowsservercore-1803
 golang:1.11.5-windowsservercore-1809
 golang:1.11.5-windowsservercore-ltsc2016
-golang:1.12rc1
-golang:1.12rc1-alpine
-golang:1.12rc1-alpine3.8
-golang:1.12rc1-alpine3.9
-golang:1.12rc1-nanoserver
-golang:1.12rc1-nanoserver-sac2016
-golang:1.12rc1-stretch
-golang:1.12rc1-windowsservercore
-golang:1.12rc1-windowsservercore-1709
-golang:1.12rc1-windowsservercore-1803
-golang:1.12rc1-windowsservercore-1809
-golang:1.12rc1-windowsservercore-ltsc2016
-golang:1.12-rc
-golang:1.12-rc-alpine
-golang:1.12-rc-alpine3.8
-golang:1.12-rc-alpine3.9
-golang:1.12-rc-nanoserver
-golang:1.12-rc-nanoserver-sac2016
-golang:1.12-rc-stretch
-golang:1.12-rc-windowsservercore
-golang:1.12-rc-windowsservercore-1709
-golang:1.12-rc-windowsservercore-1803
-golang:1.12-rc-windowsservercore-1809
-golang:1.12-rc-windowsservercore-ltsc2016
+golang:1.12
+golang:1.12-alpine
+golang:1.12-alpine3.9
+golang:1.12-nanoserver
+golang:1.12-nanoserver-sac2016
+golang:1.12-stretch
+golang:1.12-windowsservercore
+golang:1.12-windowsservercore-1709
+golang:1.12-windowsservercore-1803
+golang:1.12-windowsservercore-1809
+golang:1.12-windowsservercore-ltsc2016
+golang:1.12.0
+golang:1.12.0-alpine
+golang:1.12.0-alpine3.9
+golang:1.12.0-nanoserver
+golang:1.12.0-nanoserver-sac2016
+golang:1.12.0-stretch
+golang:1.12.0-windowsservercore
+golang:1.12.0-windowsservercore-1709
+golang:1.12.0-windowsservercore-1803
+golang:1.12.0-windowsservercore-1809
+golang:1.12.0-windowsservercore-ltsc2016
 golang:alpine
-golang:alpine3.8
 golang:alpine3.9
 golang:latest
 golang:nanoserver
 golang:nanoserver-sac2016
-golang:rc
-golang:rc-alpine
-golang:rc-alpine3.8
-golang:rc-alpine3.9
-golang:rc-nanoserver
-golang:rc-nanoserver-sac2016
-golang:rc-stretch
-golang:rc-windowsservercore
-golang:rc-windowsservercore-1709
-golang:rc-windowsservercore-1803
-golang:rc-windowsservercore-1809
-golang:rc-windowsservercore-ltsc2016
 golang:stretch
 golang:windowsservercore
 golang:windowsservercore-1709
diff --git a/_bashbrew-shared-tags b/_bashbrew-shared-tags
index c6d9a1c..f761e94 100644
--- a/_bashbrew-shared-tags
+++ b/_bashbrew-shared-tags
@@ -1,27 +1,18 @@
 golang:1 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
 golang:1-nanoserver -- golang:nanoserver-sac2016
 golang:1-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
-golang:1.10 -- golang:1.10-stretch, golang:1.10-windowsservercore-ltsc2016, golang:1.10-windowsservercore-1709, golang:1.10-windowsservercore-1803, golang:1.10-windowsservercore-1809
-golang:1.10-nanoserver -- golang:1.10-nanoserver-sac2016
-golang:1.10-windowsservercore -- golang:1.10-windowsservercore-ltsc2016, golang:1.10-windowsservercore-1709, golang:1.10-windowsservercore-1803, golang:1.10-windowsservercore-1809
-golang:1.10.8 -- golang:1.10-stretch, golang:1.10-windowsservercore-ltsc2016, golang:1.10-windowsservercore-1709, golang:1.10-windowsservercore-1803, golang:1.10-windowsservercore-1809
-golang:1.10.8-nanoserver -- golang:1.10-nanoserver-sac2016
-golang:1.10.8-windowsservercore -- golang:1.10-windowsservercore-ltsc2016, golang:1.10-windowsservercore-1709, golang:1.10-windowsservercore-1803, golang:1.10-windowsservercore-1809
-golang:1.11 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
-golang:1.11-nanoserver -- golang:nanoserver-sac2016
-golang:1.11-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
-golang:1.11.5 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
-golang:1.11.5-nanoserver -- golang:nanoserver-sac2016
-golang:1.11.5-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
-golang:1.12rc1 -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803, golang:rc-windowsservercore-1809
-golang:1.12rc1-nanoserver -- golang:rc-nanoserver-sac2016
-golang:1.12rc1-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803, golang:rc-windowsservercore-1809
-golang:1.12-rc -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803, golang:rc-windowsservercore-1809
-golang:1.12-rc-nanoserver -- golang:rc-nanoserver-sac2016
-golang:1.12-rc-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803, golang:rc-windowsservercore-1809
+golang:1.11 -- golang:1.11-stretch, golang:1.11-windowsservercore-ltsc2016, golang:1.11-windowsservercore-1709, golang:1.11-windowsservercore-1803, golang:1.11-windowsservercore-1809
+golang:1.11-nanoserver -- golang:1.11-nanoserver-sac2016
+golang:1.11-windowsservercore -- golang:1.11-windowsservercore-ltsc2016, golang:1.11-windowsservercore-1709, golang:1.11-windowsservercore-1803, golang:1.11-windowsservercore-1809
+golang:1.11.5 -- golang:1.11-stretch, golang:1.11-windowsservercore-ltsc2016, golang:1.11-windowsservercore-1709, golang:1.11-windowsservercore-1803, golang:1.11-windowsservercore-1809
+golang:1.11.5-nanoserver -- golang:1.11-nanoserver-sac2016
+golang:1.11.5-windowsservercore -- golang:1.11-windowsservercore-ltsc2016, golang:1.11-windowsservercore-1709, golang:1.11-windowsservercore-1803, golang:1.11-windowsservercore-1809
+golang:1.12 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
+golang:1.12-nanoserver -- golang:nanoserver-sac2016
+golang:1.12-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
+golang:1.12.0 -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
+golang:1.12.0-nanoserver -- golang:nanoserver-sac2016
+golang:1.12.0-windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
 golang:latest -- golang:stretch, golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
 golang:nanoserver -- golang:nanoserver-sac2016
-golang:rc -- golang:rc-stretch, golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803, golang:rc-windowsservercore-1809
-golang:rc-nanoserver -- golang:rc-nanoserver-sac2016
-golang:rc-windowsservercore -- golang:rc-windowsservercore-ltsc2016, golang:rc-windowsservercore-1709, golang:rc-windowsservercore-1803, golang:rc-windowsservercore-1809
 golang:windowsservercore -- golang:windowsservercore-ltsc2016, golang:windowsservercore-1709, golang:windowsservercore-1803, golang:windowsservercore-1809
diff --git a/golang_1.10-alpine/Dockerfile b/golang_1.10-alpine/Dockerfile
deleted file mode 100644
index 4fd3421..0000000
diff --git a/golang_1.10-alpine3.8/Dockerfile b/golang_1.10-alpine3.8/Dockerfile
deleted file mode 100644
index 3a45e57..0000000
diff --git a/golang_1.10-nanoserver-sac2016/Dockerfile b/golang_1.10-nanoserver-sac2016/Dockerfile
deleted file mode 100644
index 1afad68..0000000
diff --git a/golang_1.10-stretch/Dockerfile b/golang_1.10-stretch/Dockerfile
deleted file mode 100644
index 893a053..0000000
diff --git a/golang_1.10-windowsservercore-1709/Dockerfile b/golang_1.10-windowsservercore-1709/Dockerfile
deleted file mode 100644
index 5f2d166..0000000
diff --git a/golang_1.10-windowsservercore-1803/Dockerfile b/golang_1.10-windowsservercore-1803/Dockerfile
deleted file mode 100644
index 4105966..0000000
diff --git a/golang_1.10-windowsservercore-1809/Dockerfile b/golang_1.10-windowsservercore-1809/Dockerfile
deleted file mode 100644
index ced9728..0000000
diff --git a/golang_1.10-windowsservercore-ltsc2016/Dockerfile b/golang_1.10-windowsservercore-ltsc2016/Dockerfile
deleted file mode 100644
index 8350064..0000000
diff --git a/golang_alpine/Dockerfile b/golang_1.11-alpine/Dockerfile
similarity index 100%
copy from golang_alpine/Dockerfile
copy to golang_1.11-alpine/Dockerfile
diff --git a/golang_alpine3.8/Dockerfile b/golang_1.11-alpine3.8/Dockerfile
similarity index 100%
rename from golang_alpine3.8/Dockerfile
rename to golang_1.11-alpine3.8/Dockerfile
diff --git a/golang_nanoserver-sac2016/Dockerfile b/golang_1.11-nanoserver-sac2016/Dockerfile
similarity index 100%
copy from golang_nanoserver-sac2016/Dockerfile
copy to golang_1.11-nanoserver-sac2016/Dockerfile
diff --git a/golang_stretch/Dockerfile b/golang_1.11-stretch/Dockerfile
similarity index 100%
copy from golang_stretch/Dockerfile
copy to golang_1.11-stretch/Dockerfile
diff --git a/golang_windowsservercore-1709/Dockerfile b/golang_1.11-windowsservercore-1709/Dockerfile
similarity index 100%
copy from golang_windowsservercore-1709/Dockerfile
copy to golang_1.11-windowsservercore-1709/Dockerfile
diff --git a/golang_windowsservercore-1803/Dockerfile b/golang_1.11-windowsservercore-1803/Dockerfile
similarity index 100%
copy from golang_windowsservercore-1803/Dockerfile
copy to golang_1.11-windowsservercore-1803/Dockerfile
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_1.11-windowsservercore-1809/Dockerfile
similarity index 100%
copy from golang_windowsservercore-1809/Dockerfile
copy to golang_1.11-windowsservercore-1809/Dockerfile
diff --git a/golang_windowsservercore-ltsc2016/Dockerfile b/golang_1.11-windowsservercore-ltsc2016/Dockerfile
similarity index 100%
copy from golang_windowsservercore-ltsc2016/Dockerfile
copy to golang_1.11-windowsservercore-ltsc2016/Dockerfile
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index d6a56cb..7971f58 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -8,7 +8,7 @@ RUN apk add --no-cache \
 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
 RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 
-ENV GOLANG_VERSION 1.11.5
+ENV GOLANG_VERSION 1.12
 
 RUN set -eux; \
 	apk add --no-cache --virtual .build-deps \
@@ -37,7 +37,7 @@ RUN set -eux; \
 	esac; \
 	\
 	wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
-	echo 'bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e *go.tgz' | sha256sum -c -; \
+	echo '09c43d3336743866f2985f566db0520b36f4992aea2b4b2fd9f52f17049e88f2 *go.tgz' | sha256sum -c -; \
 	tar -C /usr/local -xzf go.tgz; \
 	rm go.tgz; \
 	\
diff --git a/golang_nanoserver-sac2016/Dockerfile b/golang_nanoserver-sac2016/Dockerfile
index 050d7c8..df93ea6 100644
--- a/golang_nanoserver-sac2016/Dockerfile
+++ b/golang_nanoserver-sac2016/Dockerfile
@@ -16,13 +16,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 	setx /M PATH $newPath;
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.11.5
+ENV GOLANG_VERSION 1.12
 
 RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '1c734fe614fa052f44694e993f2d06f24a56b6703ee46fdfb2b9bf277819fe40'; \
+	$sha256 = '880ced1aecef08b3471a84381b6c7e2c0e846b81dd97ecb629b534d941f282bd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/golang_rc-alpine/Dockerfile b/golang_rc-alpine/Dockerfile
deleted file mode 100644
index 4f1866c..0000000
diff --git a/golang_rc-alpine3.8/Dockerfile b/golang_rc-alpine3.8/Dockerfile
deleted file mode 100644
index 1f408e6..0000000
diff --git a/golang_rc-nanoserver-sac2016/Dockerfile b/golang_rc-nanoserver-sac2016/Dockerfile
deleted file mode 100644
index 8be87ef..0000000
diff --git a/golang_rc-stretch/Dockerfile b/golang_rc-stretch/Dockerfile
deleted file mode 100644
index a8b9d5b..0000000
diff --git a/golang_rc-windowsservercore-1709/Dockerfile b/golang_rc-windowsservercore-1709/Dockerfile
deleted file mode 100644
index d54cd1d..0000000
diff --git a/golang_rc-windowsservercore-1803/Dockerfile b/golang_rc-windowsservercore-1803/Dockerfile
deleted file mode 100644
index c0c8d26..0000000
diff --git a/golang_rc-windowsservercore-1809/Dockerfile b/golang_rc-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 5a9b9f6..0000000
diff --git a/golang_rc-windowsservercore-ltsc2016/Dockerfile b/golang_rc-windowsservercore-ltsc2016/Dockerfile
deleted file mode 100644
index 952ccbf..0000000
diff --git a/golang_stretch/Dockerfile b/golang_stretch/Dockerfile
index 8630b11..54db0f1 100644
--- a/golang_stretch/Dockerfile
+++ b/golang_stretch/Dockerfile
@@ -9,20 +9,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.11.5
+ENV GOLANG_VERSION 1.12
 
 RUN set -eux; \
 	\
 # this "case" statement is generated via "update.sh"
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
-		amd64) goRelArch='linux-amd64'; goRelSha256='ff54aafedff961eb94792487e827515da683d61a5f9482f668008832631e5d25' ;; \
-		armhf) goRelArch='linux-armv6l'; goRelSha256='b26b53c94923f78955236386fee0725ef4e76b6cb47e0df0ed0c0c4724e7b198' ;; \
-		arm64) goRelArch='linux-arm64'; goRelSha256='6ee9a5714444182a236d3cc4636e74cfc5e24a1bacf0463ac71dcf0e7d4288ed' ;; \
-		i386) goRelArch='linux-386'; goRelSha256='acd8e05f8d3eed406e09bb58eab89de3f0a139d4aef15f74adeed2d2c24cb440' ;; \
-		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='66e83152c68cb35d41f21453377d6a811585c9e01a6ac54b19f7a6e2cbb3d1f5' ;; \
-		s390x) goRelArch='linux-s390x'; goRelSha256='56209e5498c64a8338cd6f0fe0c2e2cbf6857c0acdb10c774894f0cc0d19f413' ;; \
-		*) goRelArch='src'; goRelSha256='bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e'; \
+		amd64) goRelArch='linux-amd64'; goRelSha256='750a07fef8579ae4839458701f4df690e0b20b8bcce33b437e4df89c451b6f13' ;; \
+		armhf) goRelArch='linux-armv6l'; goRelSha256='ea0636f055763d309437461b5817452419411eb1f598dc7f35999fae05bcb79a' ;; \
+		arm64) goRelArch='linux-arm64'; goRelSha256='b7bf59c2f1ac48eb587817a2a30b02168ecc99635fc19b6e677cce01406e3fac' ;; \
+		i386) goRelArch='linux-386'; goRelSha256='3ac1db65a6fa5c13f424b53ee181755429df0c33775733cede1e0d540440fd7b' ;; \
+		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='5be21e7035efa4a270802ea04fb104dc7a54e3492641ae44632170b93166fb68' ;; \
+		s390x) goRelArch='linux-s390x'; goRelSha256='c0aef360b99ebb4b834db8b5b22777b73a11fa37b382121b24bf587c40603915' ;; \
+		*) goRelArch='src'; goRelSha256='09c43d3336743866f2985f566db0520b36f4992aea2b4b2fd9f52f17049e88f2'; \
 			echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
 	esac; \
 	\
diff --git a/golang_windowsservercore-1709/Dockerfile b/golang_windowsservercore-1709/Dockerfile
index 075c9d0..67da46d 100644
--- a/golang_windowsservercore-1709/Dockerfile
+++ b/golang_windowsservercore-1709/Dockerfile
@@ -46,13 +46,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.11.5
+ENV GOLANG_VERSION 1.12
 
 RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '1c734fe614fa052f44694e993f2d06f24a56b6703ee46fdfb2b9bf277819fe40'; \
+	$sha256 = '880ced1aecef08b3471a84381b6c7e2c0e846b81dd97ecb629b534d941f282bd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/golang_windowsservercore-1803/Dockerfile b/golang_windowsservercore-1803/Dockerfile
index c1c1a8e..0000b62 100644
--- a/golang_windowsservercore-1803/Dockerfile
+++ b/golang_windowsservercore-1803/Dockerfile
@@ -46,13 +46,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.11.5
+ENV GOLANG_VERSION 1.12
 
 RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '1c734fe614fa052f44694e993f2d06f24a56b6703ee46fdfb2b9bf277819fe40'; \
+	$sha256 = '880ced1aecef08b3471a84381b6c7e2c0e846b81dd97ecb629b534d941f282bd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_windowsservercore-1809/Dockerfile
index cc4b029..af5b0b3 100644
--- a/golang_windowsservercore-1809/Dockerfile
+++ b/golang_windowsservercore-1809/Dockerfile
@@ -46,13 +46,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.11.5
+ENV GOLANG_VERSION 1.12
 
 RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '1c734fe614fa052f44694e993f2d06f24a56b6703ee46fdfb2b9bf277819fe40'; \
+	$sha256 = '880ced1aecef08b3471a84381b6c7e2c0e846b81dd97ecb629b534d941f282bd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/golang_windowsservercore-ltsc2016/Dockerfile b/golang_windowsservercore-ltsc2016/Dockerfile
index 58dc7b9..79aaf73 100644
--- a/golang_windowsservercore-ltsc2016/Dockerfile
+++ b/golang_windowsservercore-ltsc2016/Dockerfile
@@ -46,13 +46,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.11.5
+ENV GOLANG_VERSION 1.12
 
 RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '1c734fe614fa052f44694e993f2d06f24a56b6703ee46fdfb2b9bf277819fe40'; \
+	$sha256 = '880ced1aecef08b3471a84381b6c7e2c0e846b81dd97ecb629b534d941f282bd'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \

@tianon
Copy link
Member Author

tianon commented Feb 26, 2019

LGTM

Build test of #5473; 3570595; amd64 (golang):

$ bashbrew build golang:1.12.0-stretch
Building bashbrew/cache:b7c5d817c74fca32e3db58c3bf676969ef9a52548fc2c33997ffd00cdced6d42 (golang:1.12.0-stretch)
Tagging golang:1.12.0-stretch
Tagging golang:1.12-stretch
Tagging golang:1-stretch
Tagging golang:stretch
Tagging golang:1.12.0
Tagging golang:1.12
Tagging golang:1
Tagging golang:latest

$ test/run.sh golang:1.12.0-stretch
testing golang:1.12.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.12.0-alpine3.9
Building bashbrew/cache:2ba7e7a019b1f75eecc5d252c74df23fab23a3ce86a65d96aa8f4e715511b86d (golang:1.12.0-alpine3.9)
Tagging golang:1.12.0-alpine3.9
Tagging golang:1.12-alpine3.9
Tagging golang:1-alpine3.9
Tagging golang:alpine3.9
Tagging golang:1.12.0-alpine
Tagging golang:1.12-alpine
Tagging golang:1-alpine
Tagging golang:alpine

$ test/run.sh golang:1.12.0-alpine3.9
testing golang:1.12.0-alpine3.9
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.12.0-windowsservercore-ltsc2016
skipping "golang:1.12.0-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.12.0-windowsservercore-ltsc2016
testing golang:1.12.0-windowsservercore-ltsc2016
	image has no tests...skipping


$ bashbrew build golang:1.12.0-windowsservercore-1709
skipping "golang:1.12.0-windowsservercore-1709" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.12.0-windowsservercore-1709
testing golang:1.12.0-windowsservercore-1709
	image has no tests...skipping


$ bashbrew build golang:1.12.0-windowsservercore-1803
skipping "golang:1.12.0-windowsservercore-1803" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.12.0-windowsservercore-1803
testing golang:1.12.0-windowsservercore-1803
	image has no tests...skipping


$ bashbrew build golang:1.12.0-windowsservercore-1809
skipping "golang:1.12.0-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.12.0-windowsservercore-1809
testing golang:1.12.0-windowsservercore-1809
	image has no tests...skipping


$ bashbrew build golang:1.12.0-nanoserver-sac2016
skipping "golang:1.12.0-nanoserver-sac2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.12.0-nanoserver-sac2016
testing golang:1.12.0-nanoserver-sac2016
	image has no tests...skipping


$ bashbrew build golang:1.11.5-stretch
Using bashbrew/cache:f07cdaa3520a0d852ecd621be6cc1a082d6482d7ca30a45a9769155ab2dfde86 (golang:1.11.5-stretch)
Tagging golang:1.11.5-stretch
Tagging golang:1.11-stretch
Tagging golang:1.11.5
Tagging golang:1.11

$ test/run.sh golang:1.11.5-stretch
testing golang:1.11.5-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.11.5-alpine3.9
Using bashbrew/cache:563b8c8884156265d61e265400503602a7e14a41f52bf22e7a0b9f08010a54e1 (golang:1.11.5-alpine3.9)
Tagging golang:1.11.5-alpine3.9
Tagging golang:1.11-alpine3.9
Tagging golang:1.11.5-alpine
Tagging golang:1.11-alpine

$ test/run.sh golang:1.11.5-alpine3.9
testing golang:1.11.5-alpine3.9
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.11.5-alpine3.8
Using bashbrew/cache:ecdb1b2de9bcb2efe59701e1969aa1e9fb10e1f15ba79a63d853966ac5d3551f (golang:1.11.5-alpine3.8)
Tagging golang:1.11.5-alpine3.8
Tagging golang:1.11-alpine3.8

$ test/run.sh golang:1.11.5-alpine3.8
testing golang:1.11.5-alpine3.8
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.11.5-windowsservercore-ltsc2016
skipping "golang:1.11.5-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.11.5-windowsservercore-ltsc2016
testing golang:1.11.5-windowsservercore-ltsc2016
	image has no tests...skipping


$ bashbrew build golang:1.11.5-windowsservercore-1709
skipping "golang:1.11.5-windowsservercore-1709" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.11.5-windowsservercore-1709
testing golang:1.11.5-windowsservercore-1709
	image has no tests...skipping


$ bashbrew build golang:1.11.5-windowsservercore-1803
skipping "golang:1.11.5-windowsservercore-1803" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.11.5-windowsservercore-1803
testing golang:1.11.5-windowsservercore-1803
	image has no tests...skipping


$ bashbrew build golang:1.11.5-windowsservercore-1809
skipping "golang:1.11.5-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.11.5-windowsservercore-1809
testing golang:1.11.5-windowsservercore-1809
	image has no tests...skipping


$ bashbrew build golang:1.11.5-nanoserver-sac2016
skipping "golang:1.11.5-nanoserver-sac2016" (due to architecture "amd64"; only "windows-amd64" supported)

$ test/run.sh golang:1.11.5-nanoserver-sac2016
testing golang:1.11.5-nanoserver-sac2016
	image has no tests...skipping

@tianon tianon merged commit b04dbe0 into docker-library:master Feb 26, 2019
@tianon tianon deleted the golang-1.12 branch February 26, 2019 20:14
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.

6 participants