Skip to content

Commit 14d2b34

Browse files
authored
Merge pull request #295 from pgporada/master
Update to golang 1.11.13 and 1.12.8
2 parents 7e21408 + 07bcd8d commit 14d2b34

File tree

18 files changed

+60
-60
lines changed

18 files changed

+60
-60
lines changed

1.11/alpine3.10/Dockerfile

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.11.12
11+
ENV GOLANG_VERSION 1.11.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 '6d7a5ba05476609a7614af3292f29c3be06327503c1f1fdc02ef417870fd6926 *go.tgz' | sha256sum -c -; \
40+
echo '5032095fd3f641cafcce164f551e5ae873785ce7b07ca7c143aecd18f7ba4076 *go.tgz' | sha256sum -c -; \
4141
tar -C /usr/local -xzf go.tgz; \
4242
rm go.tgz; \
4343
\

1.11/alpine3.9/Dockerfile

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.11.12
11+
ENV GOLANG_VERSION 1.11.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 '6d7a5ba05476609a7614af3292f29c3be06327503c1f1fdc02ef417870fd6926 *go.tgz' | sha256sum -c -; \
40+
echo '5032095fd3f641cafcce164f551e5ae873785ce7b07ca7c143aecd18f7ba4076 *go.tgz' | sha256sum -c -; \
4141
tar -C /usr/local -xzf go.tgz; \
4242
rm go.tgz; \
4343
\

1.11/buster/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.11.12
12+
ENV GOLANG_VERSION 1.11.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='14ec881815eb9e6618f95df5eb385d961283efc196d97912595ba6484a56180d' ;; \
20-
armhf) goRelArch='linux-armv6l'; goRelSha256='5ffe422dc054909da4e468cb0df6e2cd41cebfe4fd9515f32bb3e3fbfc416016' ;; \
21-
arm64) goRelArch='linux-arm64'; goRelSha256='d79c075773fc3121d0e719b83b46115efff685ade94545a52f3ac22f43d76196' ;; \
22-
i386) goRelArch='linux-386'; goRelSha256='8467e68d6ed6f6a95c6db6a1e352fc529f256bba0955eaef472e50cf4c0cba61' ;; \
23-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='92bd4dc0dc8227fb22ad88545dd72669923019760cd640d4cca189860870561a' ;; \
24-
s390x) goRelArch='linux-s390x'; goRelSha256='a4d100a1c92e50fd9b8a4d529da0ef0f4509c72643d6fb481918fd543f5871c0' ;; \
25-
*) goRelArch='src'; goRelSha256='6d7a5ba05476609a7614af3292f29c3be06327503c1f1fdc02ef417870fd6926'; \
19+
amd64) goRelArch='linux-amd64'; goRelSha256='50fe8e13592f8cf22304b9c4adfc11849a2c3d281b1d7e09c924ae24874c6daa' ;; \
20+
armhf) goRelArch='linux-armv6l'; goRelSha256='513eb46158917662e1588cb89f51d11839730e46847778646c36c69c687bfdc5' ;; \
21+
arm64) goRelArch='linux-arm64'; goRelSha256='e94329c97b38b5bffe9c18e84e9f521dc995e02df7696897a7626293da9ac593' ;; \
22+
i386) goRelArch='linux-386'; goRelSha256='282e20167a7aaaba7b23de980696e1944a004efd0079e80d675d66b263ef595b' ;; \
23+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='ad3c7397ddd41a5af9d9bf3c560d3d0f8c1bdef4ac4d21819a021ea88e25efca' ;; \
24+
s390x) goRelArch='linux-s390x'; goRelSha256='bd00bd27e641450f165a37a83f1e83a4ef3c626ef5675b77184e9c0147257657' ;; \
25+
*) goRelArch='src'; goRelSha256='5032095fd3f641cafcce164f551e5ae873785ce7b07ca7c143aecd18f7ba4076'; \
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/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.11.12
12+
ENV GOLANG_VERSION 1.11.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='14ec881815eb9e6618f95df5eb385d961283efc196d97912595ba6484a56180d' ;; \
20-
armhf) goRelArch='linux-armv6l'; goRelSha256='5ffe422dc054909da4e468cb0df6e2cd41cebfe4fd9515f32bb3e3fbfc416016' ;; \
21-
arm64) goRelArch='linux-arm64'; goRelSha256='d79c075773fc3121d0e719b83b46115efff685ade94545a52f3ac22f43d76196' ;; \
22-
i386) goRelArch='linux-386'; goRelSha256='8467e68d6ed6f6a95c6db6a1e352fc529f256bba0955eaef472e50cf4c0cba61' ;; \
23-
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='92bd4dc0dc8227fb22ad88545dd72669923019760cd640d4cca189860870561a' ;; \
24-
s390x) goRelArch='linux-s390x'; goRelSha256='a4d100a1c92e50fd9b8a4d529da0ef0f4509c72643d6fb481918fd543f5871c0' ;; \
25-
*) goRelArch='src'; goRelSha256='6d7a5ba05476609a7614af3292f29c3be06327503c1f1fdc02ef417870fd6926'; \
19+
amd64) goRelArch='linux-amd64'; goRelSha256='50fe8e13592f8cf22304b9c4adfc11849a2c3d281b1d7e09c924ae24874c6daa' ;; \
20+
armhf) goRelArch='linux-armv6l'; goRelSha256='513eb46158917662e1588cb89f51d11839730e46847778646c36c69c687bfdc5' ;; \
21+
arm64) goRelArch='linux-arm64'; goRelSha256='e94329c97b38b5bffe9c18e84e9f521dc995e02df7696897a7626293da9ac593' ;; \
22+
i386) goRelArch='linux-386'; goRelSha256='282e20167a7aaaba7b23de980696e1944a004efd0079e80d675d66b263ef595b' ;; \
23+
ppc64el) goRelArch='linux-ppc64le'; goRelSha256='ad3c7397ddd41a5af9d9bf3c560d3d0f8c1bdef4ac4d21819a021ea88e25efca' ;; \
24+
s390x) goRelArch='linux-s390x'; goRelSha256='bd00bd27e641450f165a37a83f1e83a4ef3c626ef5675b77184e9c0147257657' ;; \
25+
*) goRelArch='src'; goRelSha256='5032095fd3f641cafcce164f551e5ae873785ce7b07ca7c143aecd18f7ba4076'; \
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/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.11.12
17+
ENV GOLANG_VERSION 1.11.13
1818

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

2222
WORKDIR $GOPATH

1.11/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.11.12
17+
ENV GOLANG_VERSION 1.11.13
1818

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

2222
WORKDIR $GOPATH

1.11/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.11.12
49+
ENV GOLANG_VERSION 1.11.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 = 'a86e41e06d39f68ea8fa6a7765ce529abe3ec5037ba3a3bff2e6d25455a4fa34'; \
55+
$sha256 = '55752de84439d0ed744ad681ae0915314516e69091fb86cab9701628ce3a65ff'; \
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/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.11.12
49+
ENV GOLANG_VERSION 1.11.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 = 'a86e41e06d39f68ea8fa6a7765ce529abe3ec5037ba3a3bff2e6d25455a4fa34'; \
55+
$sha256 = '55752de84439d0ed744ad681ae0915314516e69091fb86cab9701628ce3a65ff'; \
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/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.11.12
49+
ENV GOLANG_VERSION 1.11.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 = 'a86e41e06d39f68ea8fa6a7765ce529abe3ec5037ba3a3bff2e6d25455a4fa34'; \
55+
$sha256 = '55752de84439d0ed744ad681ae0915314516e69091fb86cab9701628ce3a65ff'; \
5656
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
5757
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
5858
Write-Host 'FAILED!'; \

1.12/alpine3.10/Dockerfile

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.12.7
11+
ENV GOLANG_VERSION 1.12.8
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 '95e8447d6f04b8d6a62de1726defbb20ab203208ee167ed15f83d7978ce43b13 *go.tgz' | sha256sum -c -; \
40+
echo '11ad2e2e31ff63fcf8a2bdffbe9bfa2e1845653358daed593c8c2d03453c9898 *go.tgz' | sha256sum -c -; \
4141
tar -C /usr/local -xzf go.tgz; \
4242
rm go.tgz; \
4343
\

0 commit comments

Comments
 (0)