Revert back to Go 1.8.1 and use more nice bits provided by upstream (xxx.sha256 files, for example)

tianon · tianon · commit a3b3abe48e2a · 2017-05-19T10:06:35.000-07:00
diff --git a/1.8/Dockerfile b/1.8/Dockerfile
@@ -9,19 +9,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.8
+ENV GOLANG_VERSION 1.8.1
 
 RUN set -eux; \
 	\
 # this "case" statement is generated via "update.sh"
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
-		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='7e78afe33377b4d4c04817d48feb9f2a904406d32216df015d44462f0432643b' ;; \
-		i386) goRelArch='linux-386'; goRelSha256='8f618dc8b01c2e53e639a38d780645b8424e671e292c7b518248022205d6a448' ;; \
-		s390x) goRelArch='linux-s390x'; goRelSha256='fb893a546902c2afdff929ddf5a9fbc0fd50b9017126ee85e80604d8620010fe' ;; \
-		armhf) goRelArch='linux-armv6l'; goRelSha256='32553dbb342f74a821ed5069cb72ec7e135c031102e7d01c6bc4da8ad6df5202' ;; \
-		amd64) goRelArch='linux-amd64'; goRelSha256='53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca' ;; \
-		*) goRelArch='src'; goRelSha256='406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596'; \
+		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='b7b47572a2676449716865a66901090c057f6f1d8dfb1e19528fcd0372e5ce74' ;; \
+		i386) goRelArch='linux-386'; goRelSha256='cb3f4527112075a8b045d708f793aeee2709d2f5ddd320973a1413db06fddb50' ;; \
+		s390x) goRelArch='linux-s390x'; goRelSha256='0a59f4034a27fc51431989da520fd244d5261f364888134cab737e5bc2158cb2' ;; \
+		armhf) goRelArch='linux-armv6l'; goRelSha256='e8a8326913640409028ef95c2107773f989b1b2a6e11ceb463c77c42887381da' ;; \
+		amd64) goRelArch='linux-amd64'; goRelSha256='a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994' ;; \
+		*) goRelArch='src'; goRelSha256='33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57'; \
 			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/1.8/alpine/Dockerfile b/1.8/alpine/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.5
 
 RUN apk add --no-cache ca-certificates
 
-ENV GOLANG_VERSION 1.8
+ENV GOLANG_VERSION 1.8.1
 
 # https://golang.org/issue/14851 (Go 1.8 & 1.7)
 # https://golang.org/issue/17847 (Go 1.7)
@@ -30,7 +30,7 @@ RUN set -eux; \
 	; \
 	\
 	wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
-	echo '406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596 *go.tgz' | sha256sum -c -; \
+	echo '33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 *go.tgz' | sha256sum -c -; \
 	tar -C /usr/local -xzf go.tgz; \
 	rm go.tgz; \
 	\
diff --git a/1.8/stretch/Dockerfile b/1.8/stretch/Dockerfile
@@ -9,19 +9,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.8
+ENV GOLANG_VERSION 1.8.1
 
 RUN set -eux; \
 	\
 # this "case" statement is generated via "update.sh"
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "${dpkgArch##*-}" in \
-		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='7e78afe33377b4d4c04817d48feb9f2a904406d32216df015d44462f0432643b' ;; \
-		i386) goRelArch='linux-386'; goRelSha256='8f618dc8b01c2e53e639a38d780645b8424e671e292c7b518248022205d6a448' ;; \
-		s390x) goRelArch='linux-s390x'; goRelSha256='fb893a546902c2afdff929ddf5a9fbc0fd50b9017126ee85e80604d8620010fe' ;; \
-		armhf) goRelArch='linux-armv6l'; goRelSha256='32553dbb342f74a821ed5069cb72ec7e135c031102e7d01c6bc4da8ad6df5202' ;; \
-		amd64) goRelArch='linux-amd64'; goRelSha256='53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca' ;; \
-		*) goRelArch='src'; goRelSha256='406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596'; \
+		ppc64el) goRelArch='linux-ppc64le'; goRelSha256='b7b47572a2676449716865a66901090c057f6f1d8dfb1e19528fcd0372e5ce74' ;; \
+		i386) goRelArch='linux-386'; goRelSha256='cb3f4527112075a8b045d708f793aeee2709d2f5ddd320973a1413db06fddb50' ;; \
+		s390x) goRelArch='linux-s390x'; goRelSha256='0a59f4034a27fc51431989da520fd244d5261f364888134cab737e5bc2158cb2' ;; \
+		armhf) goRelArch='linux-armv6l'; goRelSha256='e8a8326913640409028ef95c2107773f989b1b2a6e11ceb463c77c42887381da' ;; \
+		amd64) goRelArch='linux-amd64'; goRelSha256='a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994' ;; \
+		*) goRelArch='src'; goRelSha256='33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57'; \
 			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/1.8/windows/nanoserver/Dockerfile b/1.8/windows/nanoserver/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.8
+ENV GOLANG_VERSION 1.8.1
 
 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 = 'cb27fe210f3a9d10329d48514895d2a1e3651125a7c3c758f0358a5bfc0e3060'; \
+	$sha256 = 'bb6f0fbef8b80c382455af8699bfbb7fe89256d4baf06d927feaeceb7342e4ee'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/1.8/windows/windowsservercore/Dockerfile b/1.8/windows/windowsservercore/Dockerfile
@@ -45,13 +45,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.8
+ENV GOLANG_VERSION 1.8.1
 
 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 = 'cb27fe210f3a9d10329d48514895d2a1e3651125a7c3c758f0358a5bfc0e3060'; \
+	$sha256 = 'bb6f0fbef8b80c382455af8699bfbb7fe89256d4baf06d927feaeceb7342e4ee'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/update.sh b/update.sh
@@ -37,12 +37,6 @@ sed_escape_rhs() {
 	echo "$@" | sed -e 's/[\/&]/\\&/g' | sed -e ':a;N;$!ba;s/\n/\\n/g'
 }
 
-googleSource="$(curl -fsSL 'https://golang.org/dl/')"
-scrape_sha256() {
-	local filename="$1"
-	echo $googleSource | grep -Po '">'"$(sed_escape_lhs "$filename")"'</a>.*?>[a-f0-9]{40,64}<' | sed -r 's!.*>([a-f0-9]{64})<.*!\1!; s!.*[<>]+.*!!' | tail -1
-}
-
 travisEnv=
 appveyorEnv=
 for version in "${versions[@]}"; do
@@ -52,26 +46,39 @@ for version in "${versions[@]}"; do
 		rcGrepV=
 	fi
 	rcGrepV+=' -E'
-	rcGrepExpr='rc'
+	rcGrepExpr='beta|rc'
 
-	# First check for full version from GitHub as a canonical source
-	fullVersion="$(curl -fsSL "https://raw.githubusercontent.com/golang/go/release-branch.go$rcVersion/VERSION" 2>/dev/null | grep $rcGrepV -- "$rcGrepExpr" || true)"
-	if [ -z "$fullVersion" ]; then
-		echo >&2 "warning: cannot find version from GitHub for $version, scraping golang download page"
-		fullVersion="$(echo $googleSource | grep -Po '">go'"$rcVersion"'.*?\.src\.tar\.gz</a>' | sed -r 's!.*go([^"/<]+)\.src\.tar\.gz.*!\1!' | grep $rcGrepV -- "$rcGrepExpr" | sort -V | tail -1)"
-	fi
+	# https://github.com/golang/go/issues/13220
+	fullVersion="$(
+		curl -fsSL 'https://storage.googleapis.com/golang/' \
+			| grep -oE '<Key>go[^<]+[.]src[.]tar[.]gz</Key>' \
+			| sed -r \
+				-e 's!</?Key>!!g' \
+				-e 's![.]src[.]tar[.]gz$!!' \
+				-e 's!^go!!' \
+			| grep $rcGrepV -- "$rcGrepExpr" \
+			| grep -E "^${version}([.]|$)" \
+			| sort -V \
+			| tail -1
+	)" || true
 	if [ -z "$fullVersion" ]; then
 		echo >&2 "warning: cannot find full version for $version"
 		continue
 	fi
 	fullVersion="${fullVersion#go}" # strip "go" off "go1.4.2"
 
-	srcSha256="$(scrape_sha256 "go${fullVersion}.src.tar.gz")"
+	# https://github.com/golang/build/commit/24f7399f96feb8dd2fc54f064e47a886c2f8bb4a
+	srcSha256="$(curl -fsSL "https://storage.googleapis.com/golang/go${fullVersion}.src.tar.gz.sha256")"
+	if [ -z "$srcSha256" ]; then
+		echo >&2 "warning: cannot find sha256 for $fullVersion src tarball"
+		continue
+	fi
+
 	linuxArchCase='dpkgArch="$(dpkg --print-architecture)"; '$'\\\n'
 	linuxArchCase+=$'\t''case "${dpkgArch##*-}" in '$'\\\n'
 	for dpkgArch in "${!dpkgArches[@]}"; do
 		goArch="${dpkgArches[$dpkgArch]}"
-		sha256="$(scrape_sha256 "go${fullVersion}.linux-${goArch}.tar.gz")"
+		sha256="$(curl -fsSL "https://storage.googleapis.com/golang/go${fullVersion}.linux-${goArch}.tar.gz.sha256")"
 		if [ -z "$sha256" ]; then
 			echo >&2 "warning: cannot find sha256 for $fullVersion on arch $goArch"
 			continue 2
@@ -81,7 +88,8 @@ for version in "${versions[@]}"; do
 	linuxArchCase+=$'\t\t'"*) goRelArch='src'; goRelSha256='$srcSha256'; "$'\\\n'
 	linuxArchCase+=$'\t\t\t''echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; '$'\\\n'
 	linuxArchCase+=$'\t''esac'
-	windowsSha256="$(scrape_sha256 "go${fullVersion}.windows-amd64.zip")"
+
+	windowsSha256="$(curl -fsSL "https://storage.googleapis.com/golang/go${fullVersion}.windows-amd64.zip.sha256")"
 
 	for variant in alpine3.5 alpine; do
 		if [ -d "$version/$variant" ]; then

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ FROM alpine:3.5`
`2`	`2`
`3`	`3`	`RUN apk add --no-cache ca-certificates`
`4`	`4`
`5`		`-ENV GOLANG_VERSION 1.8`
	`5`	`+ENV GOLANG_VERSION 1.8.1`
`6`	`6`
`7`	`7`	`# https://golang.org/issue/14851 (Go 1.8 & 1.7)`
`8`	`8`	`# https://golang.org/issue/17847 (Go 1.7)`
`@@ -30,7 +30,7 @@ RUN set -eux; \`
`30`	`30`	`; \`
`31`	`31`	`\`
`32`	`32`	`wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \`
`33`		`- echo '406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596 *go.tgz' \| sha256sum -c -; \`
	`33`	`+ echo '33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 *go.tgz' \| sha256sum -c -; \`
`34`	`34`	`tar -C /usr/local -xzf go.tgz; \`
`35`	`35`	`rm go.tgz; \`
`36`	`36`	`\`