Skip to content

Commit 2909cfd

Browse files
committed
Update to 1.13
1 parent 3a6407a commit 2909cfd

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ image: Visual Studio 2017
33

44
environment:
55
matrix:
6-
- version: 1.13-rc
6+
- version: 1.13
77
variant: windowsservercore-ltsc2016
88
- version: 1.12
99
variant: windowsservercore-ltsc2016

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ matrix:
55
include:
66
- os: windows
77
dist: 1803-containers
8-
env: VERSION=1.13-rc VARIANT=windows/windowsservercore-1803
8+
env: VERSION=1.13 VARIANT=windows/windowsservercore-1803
99
- os: linux
10-
env: VERSION=1.13-rc VARIANT=buster
10+
env: VERSION=1.13 VARIANT=buster
1111
- os: linux
12-
env: VERSION=1.13-rc VARIANT=alpine3.10
12+
env: VERSION=1.13 VARIANT=alpine3.10
1313
- os: windows
1414
dist: 1803-containers
1515
env: VERSION=1.12 VARIANT=windows/windowsservercore-1803
Lines changed: 2 additions & 2 deletions
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.13rc2
11+
ENV GOLANG_VERSION 1.13
1212

1313
RUN set -eux; \
1414
apk add --no-cache --virtual .build-deps \
@@ -37,7 +37,7 @@ RUN set -eux; \
3737
esac; \
3838
\
3939
wget -O go.tgz "https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz"; \
40-
echo '0c7387b3be32718282a39faa3020ff30365ef70e64fa71e10017a986587b7fe9 *go.tgz' | sha256sum -c -; \
40+
echo '3fc0b8b6101d42efd7da1da3029c0a13f22079c0c37ef9730209d8ec665bf122 *go.tgz' | sha256sum -c -; \
4141
tar -C /usr/local -xzf go.tgz; \
4242
rm go.tgz; \
4343
\
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.13rc2
12+
ENV GOLANG_VERSION 1.13
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='3cd4490021a5f1f25a7440edca03910e40a38e587b578cf52ab7143a81db1861' ;; \
20-
armhf) goRelArch='linux-armv6l'; goRelSha256='deebe2b723c818293046629344f09ead1610fba608aea038bcf25da70766f944' ;; \
21-
arm64) goRelArch='linux-arm64'; goRelSha256='184c9fff6bba9da1cf23ba7f52561cc777ac7feaf73621b3824f4a30ffa4648d' ;; \
22-
i386) goRelArch='linux-386'; goRelSha256='5f5d235b73672ee5d26917d3907f8f1966af60d4391477a5afd4300d070ca852' ;; \
23-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='7656da8bb13e450754d5df35c7d21dafb5847b00779dcc08f3c41eec7d817037' ;; \
24-
s390x) goRelArch='linux-s390x'; goRelSha256='6016103bab62f1fe6b8f90665888a23ae8c825a8e7db7a607877298148e593cf' ;; \
25-
*) goRelArch='src'; goRelSha256='0c7387b3be32718282a39faa3020ff30365ef70e64fa71e10017a986587b7fe9'; \
19+
amd64) goRelArch='linux-amd64'; goRelSha256='68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856' ;; \
20+
armhf) goRelArch='linux-armv6l'; goRelSha256='931906d67cae1222f501e7be26e0ee73ba89420be0c4591925901cb9a4e156f0' ;; \
21+
arm64) goRelArch='linux-arm64'; goRelSha256='e2a61328101eff3b9c1ba47ecfec5eb2fdc3eb35d8c27d505737ba98bfcb197b' ;; \
22+
i386) goRelArch='linux-386'; goRelSha256='519b3e6ae4db011b93b60e6fabb055773ae6448355b6909a6befef87e02d98f5' ;; \
23+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='807b036bb058061b6090635e2a8612aaf301895dce70a773bbcd67fa1e57337c' ;; \
24+
s390x) goRelArch='linux-s390x'; goRelSha256='b7122795910b70b68e4118d0d34685a30925f4dd861c065cf20b699a7783807a' ;; \
25+
*) goRelArch='src'; goRelSha256='3fc0b8b6101d42efd7da1da3029c0a13f22079c0c37ef9730209d8ec665bf122'; \
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.13-rc/windows/nanoserver-1803/Dockerfile renamed to 1.13/windows/nanoserver-1803/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ RUN setx /m PATH "%GOPATH%\bin;C:\go\bin;%PATH%"
1414
USER ContainerUser
1515
# doing this first to share cache across versions more aggressively
1616

17-
ENV GOLANG_VERSION 1.13rc2
17+
ENV GOLANG_VERSION 1.13
1818

19-
COPY --from=golang:1.13rc2-windowsservercore-1803 C:\\go C:\\go
19+
COPY --from=golang:1.13-windowsservercore-1803 C:\\go C:\\go
2020
RUN go version
2121

2222
WORKDIR $GOPATH

1.13-rc/windows/nanoserver-1809/Dockerfile renamed to 1.13/windows/nanoserver-1809/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ RUN setx /m PATH "%GOPATH%\bin;C:\go\bin;%PATH%"
1414
USER ContainerUser
1515
# doing this first to share cache across versions more aggressively
1616

17-
ENV GOLANG_VERSION 1.13rc2
17+
ENV GOLANG_VERSION 1.13
1818

19-
COPY --from=golang:1.13rc2-windowsservercore-1809 C:\\go C:\\go
19+
COPY --from=golang:1.13-windowsservercore-1809 C:\\go C:\\go
2020
RUN go version
2121

2222
WORKDIR $GOPATH

1.13-rc/windows/windowsservercore-1803/Dockerfile renamed to 1.13/windows/windowsservercore-1803/Dockerfile

Lines changed: 2 additions & 2 deletions
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.13rc2
49+
ENV GOLANG_VERSION 1.13
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 = 'ed34ad4b9594ab0d19b2fed9b07ea56c573279f46041b3c40a17c39a35bf285c'; \
55+
$sha256 = '7d162b83157d3171961f8e05a55b7da8476244df3fac28a5da1c9e215acfea89'; \
5656
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5757
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5858
Write-Host 'FAILED!'; \

1.13-rc/windows/windowsservercore-1809/Dockerfile renamed to 1.13/windows/windowsservercore-1809/Dockerfile

Lines changed: 2 additions & 2 deletions
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.13rc2
49+
ENV GOLANG_VERSION 1.13
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 = 'ed34ad4b9594ab0d19b2fed9b07ea56c573279f46041b3c40a17c39a35bf285c'; \
55+
$sha256 = '7d162b83157d3171961f8e05a55b7da8476244df3fac28a5da1c9e215acfea89'; \
5656
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5757
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5858
Write-Host 'FAILED!'; \

1.13-rc/windows/windowsservercore-ltsc2016/Dockerfile renamed to 1.13/windows/windowsservercore-ltsc2016/Dockerfile

Lines changed: 2 additions & 2 deletions
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.13rc2
49+
ENV GOLANG_VERSION 1.13
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 = 'ed34ad4b9594ab0d19b2fed9b07ea56c573279f46041b3c40a17c39a35bf285c'; \
55+
$sha256 = '7d162b83157d3171961f8e05a55b7da8476244df3fac28a5da1c9e215acfea89'; \
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)