8000 Update to 1.8 · daniel4git/golang@830ea98 · GitHub
[go: up one dir, main page]

Skip to content

Commit 830ea98

Browse files
Update to 1.8
1 parent 56603da commit 830ea98

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

1.8/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ 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.8.1
12+
ENV GOLANG_VERSION 1.8
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-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='b7b47572a2676449716865a66901090c057f6f1d8dfb1e19528fcd0372e5ce74' ;; \
20-
i386) goRelArch='linux-386'; goRelSha256='cb3f4527112075a8b045d708f793aeee2709d2f5ddd320973a1413db06fddb50' ;; \
21-
s390x) goRelArch='linux-s390x'; goRelSha256='0a59f4034a27fc51431989da520fd244d5261f364888134cab737e5bc2158cb2' ;; \
22-
armhf) goRelArch='linux-armv6l'; goRelSha256='e8a8326913640409028ef95c2107773f989b1b2a6e11ceb463c77c42887381da' ;; \
23-
amd64) goRelArch='linux-amd64'; goRelSha256='a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994' ;; \
24-
*) goRelArch='src'; goRelSha256='33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57'; \
19+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='7e78afe33377b4d4c04817d48feb9f2a904406d32216df015d44462f0432643b' ;; \
20+
i386) goRelArch='linux-386'; goRelSha256='8f618dc8b01c2e53e639a38d780645b8424e671e292c7b518248022205d6a448' ;; \
21+
s390x) goRelArch='linux-s390x'; goRelSha256='fb893a546902c2afdff929ddf5a9fbc0fd50b9017126ee85e80604d8620010fe' ;; \
22+
armhf) goRelArch='linux-armv6l'; goRelSha256='32553dbb342f74a821ed5069cb72ec7e135c031102e7d01c6bc4da8ad6df5202' ;; \
23+
amd64) goRelArch='linux-amd64'; goRelSha256='53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca' ;; \
24+
*) goRelArch='src'; goRelSha256='406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596'; \
2525
echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
2626
esac; \
2727
\

1.8/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.5
22

33
RUN apk add --no-cache ca-certificates
44

5-
ENV GOLANG_VERSION 1.8.1
5+
ENV GOLANG_VERSION 1.8
66

77
# https://golang.org/issue/14851 (Go 1.8 & 1.7)
88
# https://golang.org/issue/17847 (Go 1.7)
@@ -30,7 +30,7 @@ RUN set -eux; \
3030
; \
3131
\
3232
wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
33-
echo '33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57 *go.tgz' | sha256sum -c -; \
33+
echo '406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596 *go.tgz' | sha256sum -c -; \
3434
tar -C /usr/local -xzf go.tgz; \
3535
rm go.tgz; \
3636
\

1.8/stretch/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ 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.8.1
12+
ENV GOLANG_VERSION 1.8
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-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='b7b47572a2676449716865a66901090c057f6f1d8dfb1e19528fcd0372e5ce74' ;; \
20-
i386) goRelArch='linux-386'; goRelSha256='cb3f4527112075a8b045d708f793aeee2709d2f5ddd320973a1413db06fddb50' ;; \
21-
s390x) goRelArch='linux-s390x'; goRelSha256='0a59f4034a27fc51431989da520fd244d5261f364888134cab737e5bc2158cb2' ;; \
22-
armhf) goRelArch='linux-armv6l'; goRelSha256='e8a8326913640409028ef95c2107773f989b1b2a6e11ceb463c77c42887381da' ;; \
23-
amd64) goRelArch='linux-amd64'; goRelSha256='a579ab19d5237e263254f1eac5352efcf1d70b9dacadb6d6bb12b0911ede8994' ;; \
24-
*) goRelArch='src'; goRelSha256='33daf4c03f86120fdfdc66bddf6bfff4661c7ca11c5da473e537f4d69b470e57'; \
19+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='7e78afe33377b4d4c04817d48feb9f2a904406d32216df015d44462f0432643b' ;; \
20+
i386) goRelArch='linux-386'; goRelSha256='8f618dc8b01c2e53e639a38d780645b8424e671e292c7b518248022205d6a448' ;; \
21+
s390x) goRelArch='linux-s390x'; goRelSha256='fb893a546902c2afdff929ddf5a9fbc0fd50b9017126ee85e80604d8620010fe' ;; \
22+
armhf) goRelArch='linux-armv6l'; goRelSha256='32553dbb342f74a821ed5069cb72ec7e135c031102e7d01c6bc4da8ad6df5202' ;; \
23+
amd64) goRelArch='linux-amd64'; goRelSha256='53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca' ;; \
24+
*) goRelArch='src'; goRelSha256='406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596'; \
2525
echo >&2; echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; echo >&2 ;; \
2626
esac; \
2727
\

1.8/windows/nanoserver/Dockerfile

Lines changed: 2 additions 8000 & 2 deletions
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.8.1
19+
ENV GOLANG_VERSION 1.8
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 = 'bb6f0fbef8b80c382455af8699bfbb7fe89256d4baf06d927feaeceb7342e4ee'; \
25+
$sha256 = 'cb27fe210f3a9d10329d48514895d2a1e3651125a7c3c758f0358a5bfc0e3060'; \
2626
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
2727
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
2828
Write-Host 'FAILED!'; \

1.8/windows/windowsservercore/Dockerfile

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

48-
ENV GOLANG_VERSION 1.8.1
48+
ENV GOLANG_VERSION 1.8
4949

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

0 commit comments

Comments
 (0)
0