Skip to content

Commit eee7a04

Browse files
authored
Merge pull request #208 from infosiftr/go1.10
Update to 1.10 GA (and remove the now-EOL 1.8)
2 parents 75759d6 + 2f9975e commit eee7a04

File tree

27 files changed

+26
-926
lines changed

27 files changed

+26
-926
lines changed

.appveyor.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@ environment:
77
variant: windowsservercore-ltsc2016
88
- version: 1.9
99
variant: nanoserver-sac2016
10-
- version: 1.8
10+
- version: 1.10
1111
variant: windowsservercore-ltsc2016
12-
- version: 1.8
13-
variant: nanoserver-sac2016
14-
- version: 1.10-rc
15-
variant: windowsservercore-ltsc2016
16-
- version: 1.10-rc
12+
- version: 1.10
1713
variant: nanoserver-sac2016
1814

1915
install:

.travis.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@ env:
55
- VERSION=1.9 VARIANT=stretch
66
- VERSION=1.9 VARIANT=alpine3.7
77
- VERSION=1.9 VARIANT=alpine3.6
8-
- VERSION=1.8 VARIANT=jessie
9-
- VERSION=1.8 VARIANT=stretch
10-
- VERSION=1.8 VARIANT=alpine3.6
11-
- VERSION=1.8 VARIANT=alpine3.5
12-
- VERSION=1.10-rc VARIANT=stretch
13-
- VERSION=1.10-rc VARIANT=alpine3.7
8+
- VERSION=1.10 VARIANT=stretch
9+
- VERSION=1.10 VARIANT=alpine3.7
1410

1511
install:
1612
- git clone https://github.com/docker-library/official-images.git ~/official-images

1.10-rc/windows/nanoserver-sac2016/Dockerfile

Lines changed: 0 additions & 43 deletions
This file was deleted.

1.10-rc/windows/windowsservercore-1709/Dockerfile

Lines changed: 0 additions & 72 deletions
This file was deleted.

1.10-rc/windows/windowsservercore-ltsc2016/Dockerfile

Lines changed: 0 additions & 72 deletions
This file was deleted.

1.10-rc/alpine3.7/Dockerfile renamed to 1.10/alpine3.7/Dockerfile

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

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

5-
ENV GOLANG_VERSION 1.10rc2
5+
ENV GOLANG_VERSION 1.10
66

77
# no-pic.patch: https://golang.org/issue/14851 (Go 1.8 & 1.7)
88
COPY *.patch /go-alpine-patches/
@@ -34,7 +34,7 @@ RUN set -eux; \
3434
esac; \
3535
\
3636
wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
37-
echo '360bb3e627cd5308626ebe994be734da9c1c444fb420d10e79082ec110d004f6 *go.tgz' | sha256sum -c -; \
37+
echo 'f3de49289405fda5fd1483a8fe6bd2fa5469e005fd567df64485c4fa000c7f24 *go.tgz' | sha256sum -c -; \
3838
tar -C /usr/local -xzf go.tgz; \
3939
rm go.tgz; \
4040
\
File renamed without changes.
File renamed without changes.

1.10-rc/stretch/Dockerfile renamed to 1.10/stretch/Dockerfile

Lines changed: 8 additions & 8 deletions
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.10rc2
12+
ENV GOLANG_VERSION 1.10
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='6a6a4c0654bc603bcfee4d6ac34a479c260ac61b3edcc8d6773384eb0bda512e' ;; \
20-
armhf) goRelArch='linux-armv6l'; goRelSha256='aa145c2a9736cbcb39b9340182c319f7fc0ab3d0f2156d7dfd722572f4da519b' ;; \
21-
arm64) goRelArch='linux-arm64'; goRelSha256='dfa7fbe299b3766b94fb4bc231db4330b9860c44a57274f6a0d418bf00eccbc8' ;; \
22-
i386) goRelArch='linux-386'; goRelSha256='18832b97cdc2f21783ac60fc0136f25c19d39b7cc43459f5114dd62c0a212fe4' ;; \
23-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='21a6e64c83df9f124993901dda2ec608640e97a13f50cf5a58f518651b576fd8' ;; \
24-
s390x) goRelArch='linux-s390x'; goRelSha256='7d3aa6ec3a761b328e093b51ca14dbb8a8000685bb8957dbab44b4bb3b1d76e7' ;; \
25-
*) goRelArch='src'; goRelSha256='360bb3e627cd5308626ebe994be734da9c1c444fb420d10e79082ec110d004f6'; \
19+
amd64) goRelArch='linux-amd64'; goRelSha256='b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33' ;; \
20+
armhf) goRelArch='linux-armv6l'; goRelSha256='6ff665a9ab61240cf9f11a07e03e6819e452a618a32ea05bbb2c80182f838f4f' ;; \
21+
arm64) goRelArch='linux-arm64'; goRelSha256='efb47e5c0e020b180291379ab625c6ec1c2e9e9b289336bc7169e6aa1da43fd8' ;; \
22+
i386) goRelArch='linux-386'; goRelSha256='2d26a9f41fd80eeb445cc454c2ba6b3d0db2fc732c53d7d0427a9f605bfc55a1' ;; \
23+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='a1e22e2fbcb3e551e0bf59d0f8aeb4b3f2df86714f09d2acd260c6597c43beee' ;; \
24+
s390x) goRelArch='linux-s390x'; goRelSha256='71cde197e50afe17f097f81153edb450f880267699f22453272d184e0f4681d7' ;; \
25+
*) goRelArch='src'; goRelSha256='f3de49289405fda5fd1483a8fe6bd2fa5469e005fd567df64485c4fa000c7f24'; \
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.8/windows/nanoserver-sac2016/Dockerfile renamed to 1.10/windows/nanoserver-sac2016/Dockerfile

Lines changed: 2 additions & 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.7
19+
ENV GOLANG_VERSION 1.10
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 = '633a28e72b95e8372e5416dd4723881d7a7109be08daf097ebce2679939f6a82'; \
25+
$sha256 = '210b223031c254a6eb8fa138c3782b23af710a9959d64b551fa81edd762ea167'; \
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-1709/Dockerfile renamed to 1.10/windows/windowsservercore-1709/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.7
48+
ENV GOLANG_VERSION 1.10
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 = '633a28e72b95e8372e5416dd4723881d7a7109be08daf097ebce2679939f6a82'; \
54+
$sha256 = '210b223031c254a6eb8fa138c3782b23af710a9959d64b551fa81edd762ea167'; \
5555
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5656
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5757
Write-Host 'FAILED!'; \

1.8/windows/windowsservercore-ltsc2016/Dockerfile renamed to 1.10/windows/windowsservercore-ltsc2016/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.7
48+
ENV GOLANG_VERSION 1.10
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 = '633a28e72b95e8372e5416dd4723881d7a7109be08daf097ebce2679939f6a82'; \
54+
$sha256 = '210b223031c254a6eb8fa138c3782b23af710a9959d64b551fa81edd762ea167'; \
5555
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5656
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5757
Write-Host 'FAILED!'; \

1.8/alpine3.5/Dockerfile

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)