Update golang #10379
Merged
Update golang #10379
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@1373933: Merge pull request docker-library/golang#373 from techknowlogick/alpine3.14 - docker-library/golang@f300e60: Update to Alpine 3.14
Diff for 844e81d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 08bbbcf..b662eaf 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,15 +1,15 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit), Johan Euphrosine <proppy@google.com> (@proppy)
GitRepo: https://github.com/docker-library/golang.git
-Tags: 1.15.13-alpine3.12, 1.15-alpine3.12
+Tags: 1.15.13-alpine3.13, 1.15-alpine3.13
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
-Directory: 1.15/alpine3.12
+GitCommit: f300e60ca19c3b98cfcf01ca112af2ac10104320
+Directory: 1.15/alpine3.13
-Tags: 1.15.13-alpine3.13, 1.15-alpine3.13, 1.15.13-alpine, 1.15-alpine
+Tags: 1.15.13-alpine3.14, 1.15-alpine3.14, 1.15.13-alpine, 1.15-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
-Directory: 1.15/alpine3.13
+GitCommit: f300e60ca19c3b98cfcf01ca112af2ac10104320
+Directory: 1.15/alpine3.14
Tags: 1.15.13-buster, 1.15-buster
SharedTags: 1.15.13, 1.15
@@ -43,15 +43,15 @@ GitCommit: 74370a4eaf301318abc7257a82bee06ad56f44d0
Directory: 1.15/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
-Tags: 1.16.5-alpine3.12, 1.16-alpine3.12, 1-alpine3.12, alpine3.12
+Tags: 1.16.5-alpine3.13, 1.16-alpine3.13, 1-alpine3.13, alpine3.13
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
-Directory: 1.16/alpine3.12
+GitCommit: f300e60ca19c3b98cfcf01ca112af2ac10104320
+Directory: 1.16/alpine3.13
-Tags: 1.16.5-alpine3.13, 1.16-alpine3.13, 1-alpine3.13, alpine3.13, 1.16.5-alpine, 1.16-alpine, 1-alpine, alpine
+Tags: 1.16.5-alpine3.14, 1.16-alpine3.14, 1-alpine3.14, alpine3.14, 1.16.5-alpine, 1.16-alpine, 1-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
-Directory: 1.16/alpine3.13
+GitCommit: f300e60ca19c3b98cfcf01ca112af2ac10104320
+Directory: 1.16/alpine3.14
Tags: 1.16.5-buster, 1.16-buster, 1-buster, buster
SharedTags: 1.16.5, 1.16, 1, latest
@@ -85,15 +85,15 @@ GitCommit: b879b60a7d94128c8fb5aea763cf31772495511d
Directory: 1.16/windows/windowsservercore-ltsc2016
Constraints: windowsservercore-ltsc2016
-Tags: 1.17beta1-alpine3.12, 1.17-rc-alpine3.12, rc-alpine3.12
+Tags: 1.17beta1-alpine3.13, 1.17-rc-alpine3.13, rc-alpine3.13
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
-Directory: 1.17-rc/alpine3.12
+GitCommit: f300e60ca19c3b98cfcf01ca112af2ac10104320
+Directory: 1.17-rc/alpine3.13
-Tags: 1.17beta1-alpine3.13, 1.17-rc-alpine3.13, rc-alpine3.13, 1.17beta1-alpine, 1.17-rc-alpine, rc-alpine
+Tags: 1.17beta1-alpine3.14, 1.17-rc-alpine3.14, rc-alpine3.14, 1.17beta1-alpine, 1.17-rc-alpine, rc-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
-Directory: 1.17-rc/alpine3.13
+GitCommit: f300e60ca19c3b98cfcf01ca112af2ac10104320
+Directory: 1.17-rc/alpine3.14
Tags: 1.17beta1-buster, 1.17-rc-buster, rc-buster
SharedTags: 1.17beta1, 1.17-rc, rc
diff --git a/_bashbrew-list b/_bashbrew-list
index 80b7b74..bceb9b5 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
golang:1
golang:1-alpine
-golang:1-alpine3.12
golang:1-alpine3.13
+golang:1-alpine3.14
golang:1-buster
golang:1-nanoserver
golang:1-nanoserver-1809
@@ -11,8 +11,8 @@ golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2016
golang:1.15
golang:1.15-alpine
-golang:1.15-alpine3.12
golang:1.15-alpine3.13
+golang:1.15-alpine3.14
golang:1.15-buster
golang:1.15-nanoserver
golang:1.15-nanoserver-1809
@@ -22,8 +22,8 @@ golang:1.15-windowsservercore-1809
golang:1.15-windowsservercore-ltsc2016
golang:1.15.13
golang:1.15.13-alpine
-golang:1.15.13-alpine3.12
golang:1.15.13-alpine3.13
+golang:1.15.13-alpine3.14
golang:1.15.13-buster
golang:1.15.13-nanoserver
golang:1.15.13-nanoserver-1809
@@ -33,8 +33,8 @@ golang:1.15.13-windowsservercore-1809
golang:1.15.13-windowsservercore-ltsc2016
golang:1.16
golang:1.16-alpine
-golang:1.16-alpine3.12
golang:1.16-alpine3.13
+golang:1.16-alpine3.14
golang:1.16-buster
golang:1.16-nanoserver
golang:1.16-nanoserver-1809
@@ -44,8 +44,8 @@ golang:1.16-windowsservercore-1809
golang:1.16-windowsservercore-ltsc2016
golang:1.16.5
golang:1.16.5-alpine
-golang:1.16.5-alpine3.12
golang:1.16.5-alpine3.13
+golang:1.16.5-alpine3.14
golang:1.16.5-buster
golang:1.16.5-nanoserver
golang:1.16.5-nanoserver-1809
@@ -55,8 +55,8 @@ golang:1.16.5-windowsservercore-1809
golang:1.16.5-windowsservercore-ltsc2016
golang:1.17beta1
golang:1.17beta1-alpine
-golang:1.17beta1-alpine3.12
golang:1.17beta1-alpine3.13
+golang:1.17beta1-alpine3.14
golang:1.17beta1-buster
golang:1.17beta1-nanoserver
golang:1.17beta1-nanoserver-1809
@@ -66,8 +66,8 @@ golang:1.17beta1-windowsservercore-1809
golang:1.17beta1-windowsservercore-ltsc2016
golang:1.17-rc
golang:1.17-rc-alpine
-golang:1.17-rc-alpine3.12
golang:1.17-rc-alpine3.13
+golang:1.17-rc-alpine3.14
golang:1.17-rc-buster
golang:1.17-rc-nanoserver
golang:1.17-rc-nanoserver-1809
@@ -76,16 +76,16 @@ golang:1.17-rc-windowsservercore
golang:1.17-rc-windowsservercore-1809
golang:1.17-rc-windowsservercore-ltsc2016
golang:alpine
-golang:alpine3.12
golang:alpine3.13
+golang:alpine3.14
golang:buster
golang:latest
golang:nanoserver
golang:nanoserver-1809
golang:rc
golang:rc-alpine
-golang:rc-alpine3.12
golang:rc-alpine3.13
+golang:rc-alpine3.14
golang:rc-buster
golang:rc-nanoserver
golang:rc-nanoserver-1809
diff --git a/golang_1.15-alpine/Dockerfile b/golang_1.15-alpine/Dockerfile
index 61dcb19..a37f45c 100644
--- a/golang_1.15-alpine/Dockerfile
+++ b/golang_1.15-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.13
+FROM alpine:3.14
RUN apk add --no-cache \
ca-certificates
@@ -76,15 +76,17 @@ RUN set -eux; \
cd /usr/local/go/src; \
# set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully
export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
+ if [ -n "${GO386:-}" ]; then \
# https://github.com/docker-library/golang/issues/359 -> https://github.com/golang/go/issues/44500
-# (once our Alpine base has Go 1.16, we can remove this hack)
+# Go 1.15 + Alpine 3.14 == Go 1.16 bootstrap
+# Go 1.16 + Alpine 3.13 == Go 1.15 bootstrap
+# (once Go 1.15 *and* Alpine 3.13 go away, we can remove this)
GO386= ./bootstrap.bash; \
export GOROOT_BOOTSTRAP="/usr/local/go-$GOOS-$GOARCH-bootstrap"; \
"$GOROOT_BOOTSTRAP/bin/go" version; \
fi; \
./make.bash; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
+ if [ -n "${GO386:-}" ]; then \
rm -rf "$GOROOT_BOOTSTRAP"; \
fi; \
); \
diff --git a/golang_1.15-alpine3.12/Dockerfile b/golang_1.15-alpine3.13/Dockerfile
similarity index 86%
rename from golang_1.15-alpine3.12/Dockerfile
rename to golang_1.15-alpine3.13/Dockerfile
index bd759ca..1c7bafd 100644
--- a/golang_1.15-alpine3.12/Dockerfile
+++ b/golang_1.15-alpine3.13/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.12
+FROM alpine:3.13
RUN apk add --no-cache \
ca-certificates
@@ -76,17 +76,7 @@ RUN set -eux; \
cd /usr/local/go/src; \
# set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully
export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
-# https://github.com/docker-library/golang/issues/359 -> https://github.com/golang/go/issues/44500
-# (once our Alpine base has Go 1.16, we can remove this hack)
- GO386= ./bootstrap.bash; \
- export GOROOT_BOOTSTRAP="/usr/local/go-$GOOS-$GOARCH-bootstrap"; \
- "$GOROOT_BOOTSTRAP/bin/go" version; \
- fi; \
./make.bash; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
- rm -rf "$GOROOT_BOOTSTRAP"; \
- fi; \
); \
\
# pre-compile the standard library, just like the official binary release tarballs do
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index de2b390..7e5b58a 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.13
+FROM alpine:3.14
RUN apk add --no-cache \
ca-certificates
@@ -76,17 +76,7 @@ RUN set -eux; \
cd /usr/local/go/src; \
# set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully
export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
-# https://github.com/docker-library/golang/issues/359 -> https://github.com/golang/go/issues/44500
-# (once our Alpine base has Go 1.16, we can remove this hack)
- GO386= ./bootstrap.bash; \
- export GOROOT_BOOTSTRAP="/usr/local/go-$GOOS-$GOARCH-bootstrap"; \
- "$GOROOT_BOOTSTRAP/bin/go" version; \
- fi; \
./make.bash; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
- rm -rf "$GOROOT_BOOTSTRAP"; \
- fi; \
); \
\
# pre-compile the standard library, just like the official binary release tarballs do
diff --git a/golang_alpine3.12/Dockerfile b/golang_alpine3.13/Dockerfile
similarity index 93%
rename from golang_alpine3.12/Dockerfile
rename to golang_alpine3.13/Dockerfile
index d5d0ffd..92d1b9e 100644
--- a/golang_alpine3.12/Dockerfile
+++ b/golang_alpine3.13/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.12
+FROM alpine:3.13
RUN apk add --no-cache \
ca-certificates
@@ -76,15 +76,17 @@ RUN set -eux; \
cd /usr/local/go/src; \
# set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully
export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
+ if [ -n "${GO386:-}" ]; then \
# https://github.com/docker-library/golang/issues/359 -> https://github.com/golang/go/issues/44500
-# (once our Alpine base has Go 1.16, we can remove this hack)
+# Go 1.15 + Alpine 3.14 == Go 1.16 bootstrap
+# Go 1.16 + Alpine 3.13 == Go 1.15 bootstrap
+# (once Go 1.15 *and* Alpine 3.13 go away, we can remove this)
GO386= ./bootstrap.bash; \
export GOROOT_BOOTSTRAP="/usr/local/go-$GOOS-$GOARCH-bootstrap"; \
"$GOROOT_BOOTSTRAP/bin/go" version; \
fi; \
./make.bash; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
+ if [ -n "${GO386:-}" ]; then \
rm -rf "$GOROOT_BOOTSTRAP"; \
fi; \
); \
diff --git a/golang_rc-alpine/Dockerfile b/golang_rc-alpine/Dockerfile
index 07ef8a9..562f60e 100644
--- a/golang_rc-alpine/Dockerfile
+++ b/golang_rc-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.13
+FROM alpine:3.14
RUN apk add --no-cache \
ca-certificates
@@ -76,17 +76,7 @@ RUN set -eux; \
cd /usr/local/go/src; \
# set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully
export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
-# https://github.com/docker-library/golang/issues/359 -> https://github.com/golang/go/issues/44500
-# (once our Alpine base has Go 1.16, we can remove this hack)
- GO386= ./bootstrap.bash; \
- export GOROOT_BOOTSTRAP="/usr/local/go-$GOOS-$GOARCH-bootstrap"; \
- "$GOROOT_BOOTSTRAP/bin/go" version; \
- fi; \
./make.bash; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
- rm -rf "$GOROOT_BOOTSTRAP"; \
- fi; \
); \
\
# pre-compile the standard library, just like the official binary release tarballs do
diff --git a/golang_rc-alpine3.12/Dockerfile b/golang_rc-alpine3.13/Dockerfile
similarity index 93%
rename from golang_rc-alpine3.12/Dockerfile
rename to golang_rc-alpine3.13/Dockerfile
index 49044d5..63ab110 100644
--- a/golang_rc-alpine3.12/Dockerfile
+++ b/golang_rc-alpine3.13/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.12
+FROM alpine:3.13
RUN apk add --no-cache \
ca-certificates
@@ -76,15 +76,17 @@ RUN set -eux; \
cd /usr/local/go/src; \
# set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully
export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
+ if [ -n "${GO386:-}" ]; then \
# https://github.com/docker-library/golang/issues/359 -> https://github.com/golang/go/issues/44500
-# (once our Alpine base has Go 1.16, we can remove this hack)
+# Go 1.15 + Alpine 3.14 == Go 1.16 bootstrap
+# Go 1.16 + Alpine 3.13 == Go 1.15 bootstrap
+# (once Go 1.15 *and* Alpine 3.13 go away, we can remove this)
GO386= ./bootstrap.bash; \
export GOROOT_BOOTSTRAP="/usr/local/go-$GOOS-$GOARCH-bootstrap"; \
"$GOROOT_BOOTSTRAP/bin/go" version; \
fi; \
./make.bash; \
- if [ "${GO386:-}" = 'softfloat' ]; then \
+ if [ -n "${GO386:-}" ]; then \
rm -rf "$GOROOT_BOOTSTRAP"; \
fi; \
); \
|
|
I saw these tags on https://hub.docker.com/_/golang:
but looks like not really available?
1.16.5-alpine3.13 looks different
and also can't pull them with success, not sure is something went wrong? |
|
Same here:
ping @yosifkit |
|
|
This was referenced Jun 18, 2021
This was referenced Jun 22, 2021
Merged
Merged
Merged
|
Builders are updated and builds are either queued or in progress --
sorry for the delay!
|
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: