Update golang #9310
Merged
Update golang #9310
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@b9cdd8a: Merge pull request docker-library/golang#350 from infosiftr/1.16-rc - docker-library/golang@2d03ce7: Add 1.16beta1
Diff for 02e7064:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7543e6a..94b22e8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -74,3 +74,35 @@ Architectures: windows-amd64
GitCommit: a7f393378d8566caf777ad2e6b9dc9d014875a88
Directory: 1.15/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
+
+Tags: 1.16beta1-alpine3.12, 1.16-rc-alpine3.12, rc-alpine3.12, 1.16beta1-alpine, 1.16-rc-alpine, rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 2d03ce7ef01477465c84c13d68818ab2bedc7b16
+Directory: 1.16-rc/alpine3.12
+
+Tags: 1.16beta1-buster, 1.16-rc-buster, rc-buster
+SharedTags: 1.16beta1, 1.16-rc, rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 2d03ce7ef01477465c84c13d68818ab2bedc7b16
+Directory: 1.16-rc/buster
+
+Tags: 1.16beta1-nanoserver-1809, 1.16-rc-nanoserver-1809, rc-nanoserver-1809
+SharedTags: 1.16beta1-nanoserver, 1.16-rc-nanoserver, rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 2d03ce7ef01477465c84c13d68818ab2bedc7b16
+Directory: 1.16-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 1.16beta1-windowsservercore-1809, 1.16-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 1.16beta1-windowsservercore, 1.16-rc-windowsservercore, rc-windowsservercore, 1.16beta1, 1.16-rc, rc
+Architectures: windows-amd64
+GitCommit: 2d03ce7ef01477465c84c13d68818ab2bedc7b16
+Directory: 1.16-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 1.16beta1-windowsservercore-ltsc2016, 1.16-rc-windowsservercore-ltsc2016, rc-windowsservercore-ltsc2016
+SharedTags: 1.16beta1-windowsservercore, 1.16-rc-windowsservercore, rc-windowsservercore, 1.16beta1, 1.16-rc, rc
+Architectures: windows-amd64
+GitCommit: 2d03ce7ef01477465c84c13d68818ab2bedc7b16
+Directory: 1.16-rc/windows/windowsservercore-ltsc2016
+Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 157f10b..e361a1a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -47,12 +47,39 @@ golang:1.15.6-nanoserver-1809
golang:1.15.6-windowsservercore
golang:1.15.6-windowsservercore-1809
golang:1.15.6-windowsservercore-ltsc2016
+golang:1.16beta1
+golang:1.16beta1-alpine
+golang:1.16beta1-alpine3.12
+golang:1.16beta1-buster
+golang:1.16beta1-nanoserver
+golang:1.16beta1-nanoserver-1809
+golang:1.16beta1-windowsservercore
+golang:1.16beta1-windowsservercore-1809
+golang:1.16beta1-windowsservercore-ltsc2016
+golang:1.16-rc
+golang:1.16-rc-alpine
+golang:1.16-rc-alpine3.12
+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:alpine
golang:alpine3.12
golang:buster
golang:latest
golang:nanoserver
golang:nanoserver-1809
+golang:rc
+golang:rc-alpine
+golang:rc-alpine3.12
+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_alpine/Dockerfile b/golang_rc-alpine/Dockerfile
similarity index 94%
copy from golang_alpine/Dockerfile
copy to golang_rc-alpine/Dockerfile
index 14b678f..bcb8934 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_rc-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.6
+ENV GOLANG_VERSION 1.16beta1
RUN set -eux; \
apk add --no-cache --virtual .build-deps \
@@ -47,8 +47,8 @@ RUN set -eux; \
esac; \
\
# https://github.com/golang/go/issues/38536#issuecomment-616897960
- url='https://storage.googleapis.com/golang/go1.15.6.src.tar.gz'; \
- sha256='890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.src.tar.gz'; \
+ sha256='48e032c8cf71af4dc8119a29ee829c4fbd5265e32fd012564d4a70bb207695c1'; \
\
wget -O go.tgz.asc "$url.asc"; \
wget -O go.tgz "$url"; \
diff --git a/golang_buster/Dockerfile b/golang_rc-buster/Dockerfile
similarity index 71%
copy from golang_buster/Dockerfile
copy to golang_rc-buster/Dockerfile
index 070e4ad..986d3c6 100644
--- a/golang_buster/Dockerfile
+++ b/golang_rc-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.6
+ENV GOLANG_VERSION 1.16beta1
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.6.linux-amd64.tar.gz'; \
- sha256='3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.linux-amd64.tar.gz'; \
+ sha256='3931a0d493d411d6c697df6f15d5292fdd8031fde7014fded399effdad4c12d8'; \
;; \
'armhf') \
arch='linux-armv6l'; \
- url='https://storage.googleapis.com/golang/go1.15.6.linux-armv6l.tar.gz'; \
- sha256='40ba9a57764e374195018ef37c38a5fbac9bbce908eab436370631a84bfc5788'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.linux-armv6l.tar.gz'; \
+ sha256='2f31ed765b328f79d58f78a433f6e59295b77da63153fc7582f8d8402c344999'; \
;; \
'arm64') \
arch='linux-arm64'; \
- url='https://storage.googleapis.com/golang/go1.15.6.linux-arm64.tar.gz'; \
- sha256='f87515b9744154ffe31182da9341d0a61eb0795551173d242c8cad209239e492'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.linux-arm64.tar.gz'; \
+ sha256='b0f66bca136b4de8fd29645b50efa9941dc5b9eb5a67a3da837d5f8096b3431c'; \
;; \
'i386') \
arch='linux-386'; \
- url='https://storage.googleapis.com/golang/go1.15.6.linux-386.tar.gz'; \
- sha256='ad187f02158b9a9013ef03f41d14aa69c402477f178825a3940280814bcbb755'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.linux-386.tar.gz'; \
+ sha256='d32ca50affc0de30a39b63b19a19668ce539390f3d0fa71e966b726cc28ff92e'; \
;; \
'ppc64el') \
arch='linux-ppc64le'; \
- url='https://storage.googleapis.com/golang/go1.15.6.linux-ppc64le.tar.gz'; \
- sha256='d4174fc217e749ac049eacc8827df879689f2246ac230d04991ae7df336f7cb2'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.linux-ppc64le.tar.gz'; \
+ sha256='a099e01f5a55141e5df190bd531ce090b5a00c7c6a49799b483bcbe6aa0e0eab'; \
;; \
's390x') \
arch='linux-s390x'; \
- url='https://storage.googleapis.com/golang/go1.15.6.linux-s390x.tar.gz'; \
- sha256='839cc6b67687d8bb7cb044e4a9a2eac0c090765cc8ec55ffe714dfb7cd51cf3a'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.linux-s390x.tar.gz'; \
+ sha256='eeda0f0de3fa5daa8e4aa5dc86222f4b6d4b28878e943fb75cdb3d8426844f3c'; \
;; \
*) \
# https://github.com/golang/go/issues/38536#issuecomment-616897960
arch='src'; \
- url='https://storage.googleapis.com/golang/go1.15.6.src.tar.gz'; \
- sha256='890bba73c5e2b19ffb1180e385ea225059eb008eb91b694875dd86ea48675817'; \
+ url='https://storage.googleapis.com/golang/go1.16beta1.src.tar.gz'; \
+ sha256='48e032c8cf71af4dc8119a29ee829c4fbd5265e32fd012564d4a70bb207695c1'; \
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_1.14-nanoserver-1809/Dockerfile b/golang_rc-nanoserver-1809/Dockerfile
similarity index 87%
copy from golang_1.14-nanoserver-1809/Dockerfile
copy to golang_rc-nanoserver-1809/Dockerfile
index 09229e1..331de00 100644
--- a/golang_1.14-nanoserver-1809/Dockerfile
+++ b/golang_rc-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.14.13
+ENV GOLANG_VERSION 1.16beta1
-COPY --from=golang:1.14.13-windowsservercore-1809 C:\\go C:\\go
+COPY --from=golang:1.16beta1-windowsservercore-1809 C:\\go C:\\go
RUN go version
WORKDIR $GOPATH
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_rc-windowsservercore-1809/Dockerfile
similarity index 94%
copy from golang_windowsservercore-1809/Dockerfile
copy to golang_rc-windowsservercore-1809/Dockerfile
index 6b0b534..c4ea828 100644
--- a/golang_windowsservercore-1809/Dockerfile
+++ b/golang_rc-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.6
+ENV GOLANG_VERSION 1.16beta1
-RUN $url = 'https://storage.googleapis.com/golang/go1.15.6.windows-amd64.zip'; \
+RUN $url = 'https://storage.googleapis.com/golang/go1.16beta1.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = 'b7b3808bb072c2bab73175009187fd5a7f20ffe0a31739937003a14c5c4d9006'; \
+ $sha256 = 'f06e2d7f300843473527e8fdd2d496aef5ffa6507ade0ac1141934e5c6ca7d63'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \
diff --git a/golang_1.14-windowsservercore-ltsc2016/Dockerfile b/golang_rc-windowsservercore-ltsc2016/Dockerfile
similarity index 94%
copy from golang_1.14-windowsservercore-ltsc2016/Dockerfile
copy to golang_rc-windowsservercore-ltsc2016/Dockerfile
index e92019e..0e62e34 100644
--- a/golang_1.14-windowsservercore-ltsc2016/Dockerfile
+++ b/golang_rc-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.14.13
+ENV GOLANG_VERSION 1.16beta1
-RUN $url = 'https://storage.googleapis.com/golang/go1.14.13.windows-amd64.zip'; \
+RUN $url = 'https://storage.googleapis.com/golang/go1.16beta1.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = '18c5597d7648ce3872f4a0a7bc73a70c01b56b77feac5e5f80b2ecba0d231473'; \
+ $sha256 = 'f06e2d7f300843473527e8fdd2d496aef5ffa6507ade0ac1141934e5c6ca7d63'; \
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: