Merge pull request #149 from belak/belak/1.8-release

tianon · web-flow · commit f39dae702f57 · 2017-02-16T13:50:49.000-08:00
Update to 1.8
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,9 @@ language: bash
 services: docker
 
 env:
-  - VERSION=1.8-rc VARIANT=
-  - VERSION=1.8-rc VARIANT=stretch
-  - VERSION=1.8-rc VARIANT=alpine
+  - VERSION=1.8 VARIANT=
+  - VERSION=1.8 VARIANT=stretch
+  - VERSION=1.8 VARIANT=alpine
   - VERSION=1.7 VARIANT=
   - VERSION=1.7 VARIANT=wheezy
   - VERSION=1.7 VARIANT=alpine
diff --git a/1.8/Dockerfile b/1.8/Dockerfile
@@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.8rc3
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 0ff3faba02ac83920a65b453785771e75f128fbf9ba4ad1d5e72c044103f9c7a
+ENV GOLANG_DOWNLOAD_SHA256 53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
 	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
diff --git a/1.8/alpine/Dockerfile b/1.8/alpine/Dockerfile
@@ -2,9 +2,9 @@ FROM alpine:3.5
 
 RUN apk add --no-cache ca-certificates
 
-ENV GOLANG_VERSION 1.8rc3
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_SRC_URL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz
-ENV GOLANG_SRC_SHA256 38b1c1738f111f7bccdd372efca2aa98a7bad1ca2cb21767ba69f34ae007499c
+ENV GOLANG_SRC_SHA256 406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596
 
 # https://golang.org/issue/14851
 COPY no-pic.patch /
diff --git a/1.8/alpine/go-wrapper b/1.8/alpine/go-wrapper
diff --git a/1.8/alpine/no-pic.patch b/1.8/alpine/no-pic.patch
diff --git a/1.8/go-wrapper b/1.8/go-wrapper
diff --git a/1.8/onbuild/Dockerfile b/1.8/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8-rc
+FROM golang:1.8
 
 RUN mkdir -p /go/src/app
 WORKDIR /go/src/app
diff --git a/1.8/stretch/Dockerfile b/1.8/stretch/Dockerfile
@@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.8rc3
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 0ff3faba02ac83920a65b453785771e75f128fbf9ba4ad1d5e72c044103f9c7a
+ENV GOLANG_DOWNLOAD_SHA256 53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
 	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
diff --git a/1.8/stretch/go-wrapper b/1.8/stretch/go-wrapper
diff --git a/1.8/windows/nanoserver/Dockerfile b/1.8/windows/nanoserver/Dockerfile
@@ -16,9 +16,9 @@ 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.8rc3
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.windows-amd64.zip
-ENV GOLANG_DOWNLOAD_SHA256 9ac7224a79dfd2d390ff4c5202f09fae2a5b07e9b0ebf32913979635e7143383
+ENV GOLANG_DOWNLOAD_SHA256 cb27fe210f3a9d10329d48514895d2a1e3651125a7c3c758f0358a5bfc0e3060
 
 RUN Write-Host ('Downloading {0} ...' -f $env:GOLANG_DOWNLOAD_URL); \
 	Invoke-WebRequest -Uri $env:GOLANG_DOWNLOAD_URL -OutFile 'go.zip'; \
diff --git a/1.8/windows/windowsservercore/Dockerfile b/1.8/windows/windowsservercore/Dockerfile
@@ -45,9 +45,9 @@ 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.8rc3
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.windows-amd64.zip
-ENV GOLANG_DOWNLOAD_SHA256 9ac7224a79dfd2d390ff4c5202f09fae2a5b07e9b0ebf32913979635e7143383
+ENV GOLANG_DOWNLOAD_SHA256 cb27fe210f3a9d10329d48514895d2a1e3651125a7c3c758f0358a5bfc0e3060
 
 RUN Write-Host ('Downloading {0} ...' -f $env:GOLANG_DOWNLOAD_URL); \
 	Invoke-WebRequest -Uri $env:GOLANG_DOWNLOAD_URL -OutFile 'go.zip'; \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -2,8 +2,7 @@
 set -eu
 
 declare -A aliases=(
-	[1.7]='1 latest'
-	[1.8-rc]='rc'
+	[1.8]='1 latest'
 )
 
 self="$(basename "$BASH_SOURCE")"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.8-rc`
	`1`	`+FROM golang:1.8`
`2`	`2`
`3`	`3`	`RUN mkdir -p /go/src/app`
`4`	`4`	`WORKDIR /go/src/app`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`	`set -eu`
`3`	`3`
`4`	`4`	`declare -A aliases=(`
`5`		`- [1.7]='1 latest'`
`6`		`- [1.8-rc]='rc'`
	`5`	`+ [1.8]='1 latest'`
`7`	`6`	`)`
`8`	`7`
`9`	`8`	`self="$(basename "$BASH_SOURCE")"`