Skip to content

Commit 9d80ad8

Browse files
Update to 1.11beta2
1 parent e116b27 commit 9d80ad8

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

1.11-rc/alpine3.7/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apk add --no-cache \
88
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
99
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
1010

11-
ENV GOLANG_VERSION 1.11beta1
11+
ENV GOLANG_VERSION 1.11beta2
1212

1313
# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
1414
#COPY *.patch /go-alpine-patches/
@@ -40,7 +40,7 @@ RUN set -eux; \
4040
esac; \
4141
\
4242
wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
43-
echo '5955eeb8f45e02aa5357fc18e62f1fe6c1b19e0c50aba93b8b9d9ef13b862dda *go.tgz' | sha256sum -c -; \
43+
echo '50f4bd23334f54c60ad7d07c742874c62488cf1556fa3e6e51dc03d5f5abda81 *go.tgz' | sha256sum -c -; \
4444
tar -C /usr/local -xzf go.tgz; \
4545
rm go.tgz; \
4646
\

1.11-rc/alpine3.8/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apk add --no-cache \
88
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
99
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
1010

11-
ENV GOLANG_VERSION 1.11beta1
11+
ENV GOLANG_VERSION 1.11beta2
1212

1313
# make-sure-R0-is-zero-before-main-on-ppc64le.patch: https://github.com/golang/go/commit/9aea0e89b6df032c29d0add8d69ba2c95f1106d9 (Go 1.9)
1414
#COPY *.patch /go-alpine-patches/
@@ -40,7 +40,7 @@ RUN set -eux; \
4040
esac; \
4141
\
4242
wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
43-
echo '5955eeb8f45e02aa5357fc18e62f1fe6c1b19e0c50aba93b8b9d9ef13b862dda *go.tgz' | sha256sum -c -; \
43+
echo '50f4bd23334f54c60ad7d07c742874c62488cf1556fa3e6e51dc03d5f5abda81 *go.tgz' | sha256sum -c -; \
4444
tar -C /usr/local -xzf go.tgz; \
4545
rm go.tgz; \
4646
\

1.11-rc/stretch/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
99
pkg-config \
1010
&& rm -rf /var/lib/apt/lists/*
1111

12-
ENV GOLANG_VERSION 1.11beta1
12+
ENV GOLANG_VERSION 1.11beta2
1313

1414
RUN set -eux; \
1515
\
1616
# this "case" statement is generated via "update.sh"
1717
dpkgArch="$(dpkg --print-architecture)"; \
1818
case "${dpkgArch##*-}" in \
19-
amd64) goRelArch='linux-amd64'; goRelSha256='df7fe096ffab5d331d35c6d038d2ec0426b45ce17f55a93037e371d3af9d4e6d' ;; \
20-
armhf) goRelArch='linux-armv6l'; goRelSha256='844ed9e34b118a9c2b069a18924a7879236929e08c887a92e5be1af5d701fb90' ;; \
21-
arm64) goRelArch='linux-arm64'; goRelSha256='9c1795148e777c81ac3cb381e3ea970eea60f5db2323658c061e5c4382125dd4' ;; \
22-
i386) goRelArch='linux-386'; goRelSha256='a6e804652f58785b3dfe272d96b8206250210e7ba7bdcb1ffb726ab3753db4af' ;; \
23-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='66529a525c0369d2b79ecd19f6d16444ed162c9bf88f7b37715520841c36de65' ;; \
24-
s390x) goRelArch='linux-s390x'; goRelSha256='731b9e6ac0d4c9709297f0efc1a6455589b978d2ecc207184d3e5be07a130c9c' ;; \
25-
*) goRelArch='src'; goRelSha256='5955eeb8f45e02aa5357fc18e62f1fe6c1b19e0c50aba93b8b9d9ef13b862dda'; \
19+
amd64) goRelArch='linux-amd64'; goRelSha256='ccb60f1ae6efe4fcef115db8143eb7f9ba134c63486f47b2c5176706ede35af5' ;; \
20+
armhf) goRelArch='linux-armv6l'; goRelSha256='3242225cc9bb151789b4ba606903862b68b0e81682a5ab75245d76ab1ddf38fb' ;; \
21+
arm64) goRelArch='linux-arm64'; goRelSha256='835fc6ebae5cb4368fc39683a911fe5a25c36b4251b2b254112f3fc8f36a9f39' ;; \
22+
i386) goRelArch='linux-386'; goRelSha256='acc26b494699f7dca7e30ec2c08d0f2af8813437a234f17605fafe9c7c8cf69e' ;; \
23+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='31168f17e2791e664e591dc4c5e2c37ab5c3b942a2898d84075437daed3fc9f9' ;; \
24+
s390x) goRelArch='linux-s390x'; goRelSha256='648b0f22ff517668bf4b642749a2a479d421f69b1e11bcd0ab1a71994e1c94db' ;; \
25+
*) goRelArch='src'; goRelSha256='50f4bd23334f54c60ad7d07c742874c62488cf1556fa3e6e51dc03d5f5abda81'; \
2626
echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
2727
esac; \
2828
\

1.11-rc/windows/nanoserver-sac2016/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
1616
setx /M PATH $newPath;
1717
# doing this first to share cache across versions more aggressively
1818

19-
ENV GOLANG_VERSION 1.11beta1
19+
ENV GOLANG_VERSION 1.11beta2
2020

2121
RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
2222
Write-Host ('Downloading {0} ...' -f $url); \
2323
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
2424
\
25-
$sha256 = '1eeb874a919143f3e62b641ccd5ebbfd1b3d4f2184de1d6497f7b2b6df996960'; \
25+
$sha256 = '91072cdc2cbf7b0e94c5706aea86e09d4a044aa6b60f4db4c0869ca29a8befa4'; \
2626
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
2727
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
2828
Write-Host 'FAILED!'; \

1.11-rc/windows/windowsservercore-1709/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
4646
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
4747
# doing this first to share cache across versions more aggressively
4848

49-
ENV GOLANG_VERSION 1.11beta1
49+
ENV GOLANG_VERSION 1.11beta2
5050

5151
RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
5252
Write-Host ('Downloading {0} ...' -f $url); \
5353
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
5454
\
55-
$sha256 = '1eeb874a919143f3e62b641ccd5ebbfd1b3d4f2184de1d6497f7b2b6df996960'; \
55+
$sha256 = '91072cdc2cbf7b0e94c5706aea86e09d4a044aa6b60f4db4c0869ca29a8befa4'; \
5656
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5757
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5858
Write-Host 'FAILED!'; \

1.11-rc/windows/windowsservercore-1803/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
4646
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
4747
# doing this first to share cache across versions more aggressively
4848

49-
ENV GOLANG_VERSION 1.11beta1
49+
ENV GOLANG_VERSION 1.11beta2
5050

5151
RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
5252
Write-Host ('Downloading {0} ...' -f $url); \
5353
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
5454
\
55-
$sha256 = '1eeb874a919143f3e62b641ccd5ebbfd1b3d4f2184de1d6497f7b2b6df996960'; \
55+
$sha256 = '91072cdc2cbf7b0e94c5706aea86e09d4a044aa6b60f4db4c0869ca29a8befa4'; \
5656
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5757
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5858
Write-Host 'FAILED!'; \

1.11-rc/windows/windowsservercore-ltsc2016/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
4646
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
4747
# doing this first to share cache across versions more aggressively
4848

49-
ENV GOLANG_VERSION 1.11beta1
49+
ENV GOLANG_VERSION 1.11beta2
5050

5151
RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
5252
Write-Host ('Downloading {0} ...' -f $url); \
5353
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
5454
\
55-
$sha256 = '1eeb874a919143f3e62b641ccd5ebbfd1b3d4f2184de1d6497f7b2b6df996960'; \
55+
$sha256 = '91072cdc2cbf7b0e94c5706aea86e09d4a044aa6b60f4db4c0869ca29a8befa4'; \
5656
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5757
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5858
Write-Host 'FAILED!'; \

0 commit comments

Comments
 (0)