Update golang #9639
Merged
Update golang #9639
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/golang@f85f779: Merge pull request docker-library/golang#358 from infosiftr/1.16 - docker-library/golang@b36af44: Update to 1.16 (GA), drop 1.14
Diff for 70d27d9:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8eeacc9..6c7b4ee 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,123 +1,76 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit), Johan Euphrosine <[email protected]> (@proppy)
GitRepo: https://github.com/docker-library/golang.git
-Tags: 1.14.15-alpine3.11, 1.14-alpine3.11
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/alpine3.11
-
-Tags: 1.14.15-alpine3.12, 1.14-alpine3.12
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/alpine3.12
-
-Tags: 1.14.15-alpine3.13, 1.14-alpine3.13, 1.14.15-alpine, 1.14-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/alpine3.13
-
-Tags: 1.14.15-buster, 1.14-buster
-SharedTags: 1.14.15, 1.14
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/buster
-
-Tags: 1.14.15-nanoserver-1809, 1.14-nanoserver-1809
-SharedTags: 1.14.15-nanoserver, 1.14-nanoserver
-Architectures: windows-amd64
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 1.14.15-stretch, 1.14-stretch
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/stretch
-
-Tags: 1.14.15-windowsservercore-1809, 1.14-windowsservercore-1809
-SharedTags: 1.14.15-windowsservercore, 1.14-windowsservercore, 1.14.15, 1.14
-Architectures: windows-amd64
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 1.14.15-windowsservercore-ltsc2016, 1.14-windowsservercore-ltsc2016
-SharedTags: 1.14.15-windowsservercore, 1.14-windowsservercore, 1.14.15, 1.14
-Architectures: windows-amd64
-GitCommit: 7069e104495226228f73d48f061e23fed82f1ba1
-Directory: 1.14/windows/windowsservercore-ltsc2016
-Constraints: windowsservercore-ltsc2016
-
-Tags: 1.15.8-alpine3.12, 1.15-alpine3.12, 1-alpine3.12, alpine3.12
+Tags: 1.15.8-alpine3.12, 1.15-alpine3.12
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: f0f1b321e3e8013373f89e939f2a83e0a536e546
Directory: 1.15/alpine3.12
-Tags: 1.15.8-alpine3.13, 1.15-alpine3.13, 1-alpine3.13, alpine3.13, 1.15.8-alpine, 1.15-alpine, 1-alpine, alpine
+Tags: 1.15.8-alpine3.13, 1.15-alpine3.13, 1.15.8-alpine, 1.15-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: f0f1b321e3e8013373f89e939f2a83e0a536e546
Directory: 1.15/alpine3.13
-Tags: 1.15.8-buster, 1.15-buster, 1-buster, buster
-SharedTags: 1.15.8, 1.15, 1, latest
+Tags: 1.15.8-buster, 1.15-buster
+SharedTags: 1.15.8, 1.15
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: f0f1b321e3e8013373f89e939f2a83e0a536e546
Directory: 1.15/buster
-Tags: 1.15.8-nanoserver-1809, 1.15-nanoserver-1809, 1-nanoserver-1809, nanoserver-1809
-SharedTags: 1.15.8-nanoserver, 1.15-nanoserver, 1-nanoserver, nanoserver
+Tags: 1.15.8-nanoserver-1809, 1.15-nanoserver-1809
+SharedTags: 1.15.8-nanoserver, 1.15-nanoserver
Architectures: windows-amd64
GitCommit: f0f1b321e3e8013373f89e939f2a83e0a536e546
Directory: 1.15/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
-Tags: 1.15.8-windowsservercore-1809, 1.15-windowsservercore-1809, 1-windowsservercore-1809, windowsservercore-1809
-SharedTags: 1.15.8-windowsservercore, 1.15-windowsservercore, 1-windowsservercore, windowsservercore, 1.15.8, 1.15, 1, latest
+Tags: 1.15.8-windowsservercore-1809, 1.15-windowsservercore-1809
+SharedTags: 1.15.8-windowsservercore, 1.15-windowsservercore, 1.15.8, 1.15
Architectures: windows-amd64
GitCommit: f0f1b321e3e8013373f89e939f2a83e0a536e546
Directory: 1.15/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 1.15.8-windowsservercore-ltsc2016, 1.15-windowsservercore-ltsc2016, 1-windowsservercore-ltsc2016, windowsservercore-ltsc2016
-SharedTags: 1.15.8-windowsservercore, 1.15-windowsservercore, 1-windowsservercore, windowsservercore, 1.15.8, 1.15, 1, latest
+Tags: 1.15.8-windowsservercore-ltsc2016, 1.15-windowsservercore-ltsc2016
+SharedTags: 1.15.8-windowsservercore, 1.15-windowsservercore, 1.15.8, 1.15
Architectures: windows-amd64
GitCommit: f0f1b321e3e8013373f89e939f2a83e0a536e546
Directory: 1.15/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
-Tags: 1.16rc1-alpine3.12, 1.16-rc-alpine3.12, rc-alpine3.12
+Tags: 1.16.0-alpine3.12, 1.16-alpine3.12, 1-alpine3.12, alpine3.12
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 820226fa71a0eaf46e76815c5db1e51a42d6d04d
-Directory: 1.16-rc/alpine3.12
+GitCommit: b36af443fb19f5d7d036e8bc787e3e40862cd550
+Directory: 1.16/alpine3.12
-Tags: 1.16rc1-alpine3.13, 1.16-rc-alpine3.13, rc-alpine3.13, 1.16rc1-alpine, 1.16-rc-alpine, rc-alpine
+Tags: 1.16.0-alpine3.13, 1.16-alpine3.13, 1-alpine3.13, alpine3.13, 1.16.0-alpine, 1.16-alpine, 1-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 820226fa71a0eaf46e76815c5db1e51a42d6d04d
-Directory: 1.16-rc/alpine3.13
+GitCommit: b36af443fb19f5d7d036e8bc787e3e40862cd550
+Directory: 1.16/alpine3.13
-Tags: 1.16rc1-buster, 1.16-rc-buster, rc-buster
-SharedTags: 1.16rc1, 1.16-rc, rc
+Tags: 1.16.0-buster, 1.16-buster, 1-buster, buster
+SharedTags: 1.16.0, 1.16, 1, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 820226fa71a0eaf46e76815c5db1e51a42d6d04d
-Directory: 1.16-rc/buster
+GitCommit: b36af443fb19f5d7d036e8bc787e3e40862cd550
+Directory: 1.16/buster
-Tags: 1.16rc1-nanoserver-1809, 1.16-rc-nanoserver-1809, rc-nanoserver-1809
-SharedTags: 1.16rc1-nanoserver, 1.16-rc-nanoserver, rc-nanoserver
+Tags: 1.16.0-nanoserver-1809, 1.16-nanoserver-1809, 1-nanoserver-1809, nanoserver-1809
+SharedTags: 1.16.0-nanoserver, 1.16-nanoserver, 1-nanoserver, nanoserver
Architectures: windows-amd64
-GitCommit: 820226fa71a0eaf46e76815c5db1e51a42d6d04d
-Directory: 1.16-rc/windows/nanoserver-1809
+GitCommit: b36af443fb19f5d7d036e8bc787e3e40862cd550
+Directory: 1.16/windows/nanoserver-1809
Constraints: nanoserver-1809, windowsservercore-1809
-Tags: 1.16rc1-windowsservercore-1809, 1.16-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 1.16rc1-windowsservercore, 1.16-rc-windowsservercore, rc-windowsservercore, 1.16rc1, 1.16-rc, rc
+Tags: 1.16.0-windowsservercore-1809, 1.16-windowsservercore-1809, 1-windowsservercore-1809, windowsservercore-1809
+SharedTags: 1.16.0-windowsservercore, 1.16-windowsservercore, 1-windowsservercore, windowsservercore, 1.16.0, 1.16, 1, latest
Architectures: windows-amd64
-GitCommit: 820226fa71a0eaf46e76815c5db1e51a42d6d04d
-Directory: 1.16-rc/windows/windowsservercore-1809
+GitCommit: b36af443fb19f5d7d036e8bc787e3e40862cd550
+Directory: 1.16/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 1.16rc1-windowsservercore-ltsc2016, 1.16-rc-windowsservercore-ltsc2016, rc-windowsservercore-ltsc2016
-SharedTags: 1.16rc1-windowsservercore, 1.16-rc-windowsservercore, rc-windowsservercore, 1.16rc1, 1.16-rc, rc
+Tags: 1.16.0-windowsservercore-ltsc2016, 1.16-windowsservercore-ltsc2016, 1-windowsservercore-ltsc2016, windowsservercore-ltsc2016
+SharedTags: 1.16.0-windowsservercore, 1.16-windowsservercore, 1-windowsservercore, windowsservercore, 1.16.0, 1.16, 1, latest
Architectures: windows-amd64
-GitCommit: 820226fa71a0eaf46e76815c5db1e51a42d6d04d
-Directory: 1.16-rc/windows/windowsservercore-ltsc2016
+GitCommit: b36af443fb19f5d7d036e8bc787e3e40862cd550
+Directory: 1.16/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 532632b..2acf389 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,30 +8,6 @@ golang:1-nanoserver-1809
golang:1-windowsservercore
golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2016
-golang:1.14
-golang:1.14-alpine
-golang:1.14-alpine3.11
-golang:1.14-alpine3.12
-golang:1.14-alpine3.13
-golang:1.14-buster
-golang:1.14-nanoserver
-golang:1.14-nanoserver-1809
-golang:1.14-stretch
-golang:1.14-windowsservercore
-golang:1.14-windowsservercore-1809
-golang:1.14-windowsservercore-ltsc2016
-golang:1.14.15
-golang:1.14.15-alpine
-golang:1.14.15-alpine3.11
-golang:1.14.15-alpine3.12
-golang:1.14.15-alpine3.13
-golang:1.14.15-buster
-golang:1.14.15-nanoserver
-golang:1.14.15-nanoserver-1809
-golang:1.14.15-stretch
-golang:1.14.15-windowsservercore
-golang:1.14.15-windowsservercore-1809
-golang:1.14.15-windowsservercore-ltsc2016
golang:1.15
golang:1.15-alpine
golang:1.15-alpine3.12
@@ -52,26 +28,26 @@ golang:1.15.8-nanoserver-1809
golang:1.15.8-windowsservercore
golang:1.15.8-windowsservercore-1809
golang:1.15.8-windowsservercore-ltsc2016
-golang:1.16rc1
-golang:1.16rc1-alpine
-golang:1.16rc1-alpine3.12
-golang:1.16rc1-alpine3.13
-golang:1.16rc1-buster
-golang:1.16rc1-nanoserver
-golang:1.16rc1-nanoserver-1809
-golang:1.16rc1-windowsservercore
-golang:1.16rc1-windowsservercore-1809
-golang:1.16rc1-windowsservercore-ltsc2016
-golang:1.16-rc
-golang:1.16-rc-alpine
-golang:1.16-rc-alpine3.12
-golang:1.16-rc-alpine3.13
-golang:1.16-rc-buster
-golang:1.16-rc-nanoserver
-golang:1.16-rc-nanoserver-1809
-golang:1.16-rc-windowsservercore
-golang:1.16-rc-windowsservercore-1809
-golang:1.16-rc-windowsservercore-ltsc2016
+golang:1.16
+golang:1.16-alpine
+golang:1.16-alpine3.12
+golang:1.16-alpine3.13
+golang:1.16-buster
+golang:1.16-nanoserver
+golang:1.16-nanoserver-1809
+golang:1.16-windowsservercore
+golang:1.16-windowsservercore-1809
+golang:1.16-windowsservercore-ltsc2016
+golang:1.16.0
+golang:1.16.0-alpine
+golang:1.16.0-alpine3.12
+golang:1.16.0-alpine3.13
+golang:1.16.0-buster
+golang:1.16.0-nanoserver
+golang:1.16.0-nanoserver-1809
+golang:1.16.0-windowsservercore
+golang:1.16.0-windowsservercore-1809
+golang:1.16.0-windowsservercore-ltsc2016
golang:alpine
golang:alpine3.12
golang:alpine3.13
@@ -79,16 +55,6 @@ golang:buster
golang:latest
golang:nanoserver
golang:nanoserver-1809
-golang:rc
-golang:rc-alpine
-golang:rc-alpine3.12
-golang:rc-alpine3.13
-golang:rc-buster
-golang:rc-nanoserver
-golang:rc-nanoserver-1809
-golang:rc-windowsservercore
-golang:rc-windowsservercore-1809
-golang:rc-windowsservercore-ltsc2016
golang:windowsservercore
golang:windowsservercore-1809
golang:windowsservercore-ltsc2016
diff --git a/golang_1.14-alpine/Dockerfile b/golang_1.14-alpine/Dockerfile
deleted file mode 100644
index e5716c2..0000000
diff --git a/golang_1.14-alpine3.11/Dockerfile b/golang_1.14-alpine3.11/Dockerfile
deleted file mode 100644
index e61b872..0000000
diff --git a/golang_1.14-alpine3.12/Dockerfile b/golang_1.14-alpine3.12/Dockerfile
deleted file mode 100644
index 91cbbdc..0000000
diff --git a/golang_1.14-buster/Dockerfile b/golang_1.14-buster/Dockerfile
deleted file mode 100644
index 8a35071..0000000
diff --git a/golang_1.14-nanoserver-1809/Dockerfile b/golang_1.14-nanoserver-1809/Dockerfile
deleted file mode 100644
index c63643d..0000000
diff --git a/golang_1.14-stretch/Dockerfile b/golang_1.14-stretch/Dockerfile
deleted file mode 100644
index 00e478f..0000000
diff --git a/golang_1.14-windowsservercore-1809/Dockerfile b/golang_1.14-windowsservercore-1809/Dockerfile
deleted file mode 100644
index d549128..0000000
diff --git a/golang_1.14-windowsservercore-ltsc2016/Dockerfile b/golang_1.14-windowsservercore-ltsc2016/Dockerfile
deleted file mode 100644
index dbfc45b..0000000
diff --git a/golang_alpine/Dockerfile b/golang_1.15-alpine/Dockerfile
similarity index 100%
copy from golang_alpine/Dockerfile
copy to golang_1.15-alpine/Dockerfile
diff --git a/golang_alpine3.12/Dockerfile b/golang_1.15-alpine3.12/Dockerfile
similarity index 100%
copy from golang_alpine3.12/Dockerfile
copy to golang_1.15-alpine3.12/Dockerfile
diff --git a/golang_buster/Dockerfile b/golang_1.15-buster/Dockerfile
similarity index 100%
copy from golang_buster/Dockerfile
copy to golang_1.15-buster/Dockerfile
diff --git a/golang_nanoserver-1809/Dockerfile b/golang_1.15-nanoserver-1809/Dockerfile
similarity index 100%
copy from golang_nanoserver-1809/Dockerfile
copy to golang_1.15-nanoserver-1809/Dockerfile
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_1.15-windowsservercore-1809/Dockerfile
similarity index 100%
copy from golang_windowsservercore-1809/Dockerfile
copy to golang_1.15-windowsservercore-1809/Dockerfile
diff --git a/golang_windowsservercore-ltsc2016/Dockerfile b/golang_1.15-windowsservercore-ltsc2016/Dockerfile
similarity index 100%
copy from golang_windowsservercore-ltsc2016/Dockerfile
copy to golang_1.15-windowsservercore-ltsc2016/Dockerfile
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 82445cf..8dd40ef 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.15.8
+ENV GOLANG_VERSION 1.16
RUN set -eux; \
apk add --no-cache --virtual .build-deps \
@@ -43,12 +43,12 @@ RUN set -eux; \
case "$apkArch" in \
armhf) export GOARM='6' ;; \
armv7) export GOARM='7' ;; \
- x86) export GO386='387' ;; \
+ x86) export GO386='softfloat' ;; \
esac; \
\
# https://github.com/golang/go/issues/38536#issuecomment-616897960
- url='https://storage.googleapis.com/golang/go1.15.8.src.tar.gz'; \
- sha256='540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2'; \
+ url='https://storage.googleapis.com/golang/go1.16.src.tar.gz'; \
+ sha256='7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a'; \
\
wget -O go.tgz.asc "$url.asc"; \
wget -O go.tgz "$url"; \
diff --git a/golang_alpine3.12/Dockerfile b/golang_alpine3.12/Dockerfile
index c85b4e7..c980dcf 100644
--- a/golang_alpine3.12/Dockerfile
+++ b/golang_alpine3.12/Dockerfile
@@ -16,7 +16,7 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.15.8
+ENV GOLANG_VERSION 1.16
RUN set -eux; \
apk add --no-cache --virtual .build-deps \
@@ -43,12 +43,12 @@ RUN set -eux; \
case "$apkArch" in \
armhf) export GOARM='6' ;; \
armv7) export GOARM='7' ;; \
- x86) export GO386='387' ;; \
+ x86) export GO386='softfloat' ;; \
esac; \
\
# https://github.com/golang/go/issues/38536#issuecomment-616897960
- url='https://storage.googleapis.com/golang/go1.15.8.src.tar.gz'; \
- sha256='540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2'; \
+ url='https://storage.googleapis.com/golang/go1.16.src.tar.gz'; \
+ sha256='7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a'; \
\
wget -O go.tgz.asc "$url.asc"; \
wget -O go.tgz "$url"; \
diff --git a/golang_buster/Dockerfile b/golang_buster/Dockerfile
index e254a69..5904939 100644
--- a/golang_buster/Dockerfile
+++ b/golang_buster/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.15.8
+ENV GOLANG_VERSION 1.16
RUN set -eux; \
\
@@ -25,39 +25,39 @@ RUN set -eux; \
case "${dpkgArch##*-}" in \
'amd64') \
arch='linux-amd64'; \
- url='https://storage.googleapis.com/golang/go1.15.8.linux-amd64.tar.gz'; \
- sha256='d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b'; \
+ url='https://storage.googleapis.com/golang/go1.16.linux-amd64.tar.gz'; \
+ sha256='013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2'; \
;; \
'armhf') \
arch='linux-armv6l'; \
- url='https://storage.googleapis.com/golang/go1.15.8.linux-armv6l.tar.gz'; \
- sha256='708c398cb9e5029cfd5b654370978bf0e797d4d4a71153c06c7378db7e249a53'; \
+ url='https://storage.googleapis.com/golang/go1.16.linux-armv6l.tar.gz'; \
+ sha256='d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd'; \
;; \
'arm64') \
arch='linux-arm64'; \
- url='https://storage.googleapis.com/golang/go1.15.8.linux-arm64.tar.gz'; \
- sha256='0e31ea4bf53496b0f0809730520dee98c0ae5c530f3701a19df0ba0a327bf3d2'; \
+ url='https://storage.googleapis.com/golang/go1.16.linux-arm64.tar.gz'; \
+ sha256='3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098'; \
;; \
'i386') \
arch='linux-386'; \
- url='https://storage.googleapis.com/golang/go1.15.8.linux-386.tar.gz'; \
- sha256='a0cc9df6d04f89af8396278d171087894a453a03a950b0f60a4ac18b480f758f'; \
+ url='https://storage.googleapis.com/golang/go1.16.linux-386.tar.gz'; \
+ sha256='ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa'; \
;; \
'ppc64el') \
arch='linux-ppc64le'; \
- url='https://storage.googleapis.com/golang/go1.15.8.linux-ppc64le.tar.gz'; \
- sha256='c6ddeab22b23ee33f5e8f06f9667e2092f48dbc6d5db553a66f7fe21da73fbfa'; \
+ url='https://storage.googleapis.com/golang/go1.16.linux-ppc64le.tar.gz'; \
+ sha256='27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6'; \
;; \
's390x') \
arch='linux-s390x'; \
- url='https://storage.googleapis.com/golang/go1.15.8.linux-s390x.tar.gz'; \
- sha256='ba922f54fe99dee3246705bacbfac27fa88375439025429297aa1e9caf3f2297'; \
+ url='https://storage.googleapis.com/golang/go1.16.linux-s390x.tar.gz'; \
+ sha256='be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe'; \
;; \
*) \
# https://github.com/golang/go/issues/38536#issuecomment-616897960
arch='src'; \
- url='https://storage.googleapis.com/golang/go1.15.8.src.tar.gz'; \
- sha256='540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2'; \
+ url='https://storage.googleapis.com/golang/go1.16.src.tar.gz'; \
+ sha256='7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a'; \
echo >&2; \
echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; \
echo >&2; \
diff --git a/golang_nanoserver-1809/Dockerfile b/golang_nanoserver-1809/Dockerfile
index ff39a06..8903944 100644
--- a/golang_nanoserver-1809/Dockerfile
+++ b/golang_nanoserver-1809/Dockerfile
@@ -20,9 +20,9 @@ RUN setx /m PATH "%GOPATH%\bin;C:\go\bin;%PATH%"
USER ContainerUser
# doing this first to share cache across versions more aggressively
-ENV GOLANG_VERSION 1.15.8
+ENV GOLANG_VERSION 1.16
-COPY --from=golang:1.15.8-windowsservercore-1809 C:\\go C:\\go
+COPY --from=golang:1.16-windowsservercore-1809 C:\\go C:\\go
RUN go version
WORKDIR $GOPATH
diff --git a/golang_rc-alpine/Dockerfile b/golang_rc-alpine/Dockerfile
deleted file mode 100644
index 048b058..0000000
diff --git a/golang_rc-alpine3.12/Dockerfile b/golang_rc-alpine3.12/Dockerfile
deleted file mode 100644
index 872c204..0000000
diff --git a/golang_rc-buster/Dockerfile b/golang_rc-buster/Dockerfile
deleted file mode 100644
index 9271e4c..0000000
diff --git a/golang_rc-nanoserver-1809/Dockerfile b/golang_rc-nanoserver-1809/Dockerfile
deleted file mode 100644
index 904d7c5..0000000
diff --git a/golang_rc-windowsservercore-1809/Dockerfile b/golang_rc-windowsservercore-1809/Dockerfile
deleted file mode 100644
index c00b856..0000000
diff --git a/golang_rc-windowsservercore-ltsc2016/Dockerfile b/golang_rc-windowsservercore-ltsc2016/Dockerfile
deleted file mode 100644
index d03445a..0000000
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_windowsservercore-1809/Dockerfile
index c6ca2a8..86dc90c 100644
--- a/golang_windowsservercore-1809/Dockerfile
+++ b/golang_windowsservercore-1809/Dockerfile
@@ -52,13 +52,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV GOLANG_VERSION 1.15.8
+ENV GOLANG_VERSION 1.16
-RUN $url = 'https://storage.googleapis.com/golang/go1.15.8.windows-amd64.zip'; \
+RUN $url = 'https://storage.googleapis.com/golang/go1.16.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = 'ef05b7141d3c217fb076f0e27249e144296234df96ead8751c0b76784079df97'; \
+ $sha256 = '5cc88fa506b3d5c453c54c3ea218fc8dd05d7362ae1de15bb67986b72089ce93'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \
diff --git a/golang_windowsservercore-ltsc2016/Dockerfile b/golang_windowsservercore-ltsc2016/Dockerfile
index 1ca62b2..a223786 100644
--- a/golang_windowsservercore-ltsc2016/Dockerfile
+++ b/golang_windowsservercore-ltsc2016/Dockerfile
@@ -52,13 +52,13 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV GOLANG_VERSION 1.15.8
+ENV GOLANG_VERSION 1.16
-RUN $url = 'https://storage.googleapis.com/golang/go1.15.8.windows-amd64.zip'; \
+RUN $url = 'https://storage.googleapis.com/golang/go1.16.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = 'ef05b7141d3c217fb076f0e27249e144296234df96ead8751c0b76784079df97'; \
+ $sha256 = '5cc88fa506b3d5c453c54c3ea218fc8dd05d7362ae1de15bb67986b72089ce93'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: