Update golang #15872
Merged
Update golang #15872
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
This comment has been minimized.
This comment has been minimized.
Changes: - docker-library/golang@acf6e86: Merge pull request docker-library/golang#498 from infosiftr/GOARM=7 - docker-library/golang@40db26d: Set GOARM=7 explicitly for arm32v7 images - docker-library/golang@9f8bfe7: Merge pull request docker-library/golang#497 from jnoordsij/add-alpine-3.19 - docker-library/golang@84f47a9: Update templates to add Alpine 3.19 and drop 3.17 - docker-library/golang@5f181d7: Add Alpine 3.19 and drop 3.17 to versions.sh
docker-library-bot
force-pushed
the
golang
branch
from
7bd1b1b
to
b8585b4
Compare
Diff for b8585b4:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 575eeb2..9629d42 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,15 +1,15 @@
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.20.12-alpine3.17, 1.20-alpine3.17
+Tags: 1.20.12-alpine3.18, 1.20-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: 339da23255a9dc00f7921fca9a022f6b95843358
-Directory: 1.20/alpine3.17
+Directory: 1.20/alpine3.18
-Tags: 1.20.12-alpine3.18, 1.20-alpine3.18, 1.20.12-alpine, 1.20-alpine
+Tags: 1.20.12-alpine3.19, 1.20-alpine3.19, 1.20.12-alpine, 1.20-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 339da23255a9dc00f7921fca9a022f6b95843358
-Directory: 1.20/alpine3.18
+GitCommit: 84f47a944aa3d10104ad45dd8a188b878595cac4
+Directory: 1.20/alpine3.19
Tags: 1.20.12-bookworm, 1.20-bookworm
SharedTags: 1.20.12, 1.20
@@ -50,25 +50,25 @@ GitCommit: 339da23255a9dc00f7921fca9a022f6b95843358
Directory: 1.20/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 1.21.5-alpine3.17, 1.21-alpine3.17, 1-alpine3.17, alpine3.17
+Tags: 1.21.5-alpine3.18, 1.21-alpine3.18, 1-alpine3.18, alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d106c8658abc0975bcd2d8a68a8f4ca85b04a93a
-Directory: 1.21/alpine3.17
+GitCommit: 40db26d6cc395e12ec499d7d88c77ee5f6dbe912
+Directory: 1.21/alpine3.18
-Tags: 1.21.5-alpine3.18, 1.21-alpine3.18, 1-alpine3.18, alpine3.18, 1.21.5-alpine, 1.21-alpine, 1-alpine, alpine
+Tags: 1.21.5-alpine3.19, 1.21-alpine3.19, 1-alpine3.19, alpine3.19, 1.21.5-alpine, 1.21-alpine, 1-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d106c8658abc0975bcd2d8a68a8f4ca85b04a93a
-Directory: 1.21/alpine3.18
+GitCommit: 40db26d6cc395e12ec499d7d88c77ee5f6dbe912
+Directory: 1.21/alpine3.19
Tags: 1.21.5-bookworm, 1.21-bookworm, 1-bookworm, bookworm
SharedTags: 1.21.5, 1.21, 1, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d106c8658abc0975bcd2d8a68a8f4ca85b04a93a
+GitCommit: 40db26d6cc395e12ec499d7d88c77ee5f6dbe912
Directory: 1.21/bookworm
Tags: 1.21.5-bullseye, 1.21-bullseye, 1-bullseye, bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: d106c8658abc0975bcd2d8a68a8f4ca85b04a93a
+GitCommit: 40db26d6cc395e12ec499d7d88c77ee5f6dbe912
Directory: 1.21/bullseye
Tags: 1.21.5-nanoserver-1809, 1.21-nanoserver-1809, 1-nanoserver-1809, nanoserver-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index 98cc449..410eb57 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
golang:1
golang:1-alpine
-golang:1-alpine3.17
golang:1-alpine3.18
+golang:1-alpine3.19
golang:1-bookworm
golang:1-bullseye
golang:1-nanoserver
@@ -12,8 +12,8 @@ golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2022
golang:1.20
golang:1.20-alpine
-golang:1.20-alpine3.17
golang:1.20-alpine3.18
+golang:1.20-alpine3.19
golang:1.20-bookworm
golang:1.20-bullseye
golang:1.20-nanoserver
@@ -24,8 +24,8 @@ golang:1.20-windowsservercore-1809
golang:1.20-windowsservercore-ltsc2022
golang:1.20.12
golang:1.20.12-alpine
-golang:1.20.12-alpine3.17
golang:1.20.12-alpine3.18
+golang:1.20.12-alpine3.19
golang:1.20.12-bookworm
golang:1.20.12-bullseye
golang:1.20.12-nanoserver
@@ -36,8 +36,8 @@ golang:1.20.12-windowsservercore-1809
golang:1.20.12-windowsservercore-ltsc2022
golang:1.21
golang:1.21-alpine
-golang:1.21-alpine3.17
golang:1.21-alpine3.18
+golang:1.21-alpine3.19
golang:1.21-bookworm
golang:1.21-bullseye
golang:1.21-nanoserver
@@ -48,8 +48,8 @@ golang:1.21-windowsservercore-1809
golang:1.21-windowsservercore-ltsc2022
golang:1.21.5
golang:1.21.5-alpine
-golang:1.21.5-alpine3.17
golang:1.21.5-alpine3.18
+golang:1.21.5-alpine3.19
golang:1.21.5-bookworm
golang:1.21.5-bullseye
golang:1.21.5-nanoserver
@@ -59,8 +59,8 @@ golang:1.21.5-windowsservercore
golang:1.21.5-windowsservercore-1809
golang:1.21.5-windowsservercore-ltsc2022
golang:alpine
-golang:alpine3.17
golang:alpine3.18
+golang:alpine3.19
golang:bookworm
golang:bullseye
golang:latest
diff --git a/golang_1.20-alpine/Dockerfile b/golang_1.20-alpine/Dockerfile
index 07d9ef5..91e76af 100644
--- a/golang_1.20-alpine/Dockerfile
+++ b/golang_1.20-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
RUN apk add --no-cache ca-certificates
diff --git a/golang_1.20-alpine3.17/Dockerfile b/golang_1.20-alpine3.17/Dockerfile
deleted file mode 100644
index 9070ff4..0000000
diff --git a/golang_1.20-alpine/Dockerfile b/golang_1.20-alpine3.18/Dockerfile
similarity index 100%
copy from golang_1.20-alpine/Dockerfile
copy to golang_1.20-alpine3.18/Dockerfile
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index c08d2dd..44b083f 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.18
+FROM alpine:3.19
RUN apk add --no-cache ca-certificates
@@ -112,6 +112,15 @@ RUN set -eux; \
/usr/local/go/src/cmd/dist/dist \
"$GOCACHE" \
; \
+ elif [ "$arch" = 'armv7' ]; then \
+ [ -s /usr/local/go/go.env ]; \
+ before="$(go env GOARM)"; [ "$before" != '7' ]; \
+ { \
+ echo; \
+ echo '# https://github.com/docker-library/golang/issues/494'; \
+ echo 'GOARM=7'; \
+ } >> /usr/local/go/go.env; \
+ after="$(go env GOARM)"; [ "$after" = '7' ]; \
fi; \
\
apk del --no-network .fetch-deps; \
diff --git a/golang_alpine3.17/Dockerfile b/golang_alpine3.18/Dockerfile
similarity index 92%
rename from golang_alpine3.17/Dockerfile
rename to golang_alpine3.18/Dockerfile
index 4fb4eaa..3f3d9f4 100644
--- a/golang_alpine3.17/Dockerfile
+++ b/golang_alpine3.18/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.17
+FROM alpine:3.18
RUN apk add --no-cache ca-certificates
@@ -112,6 +112,15 @@ RUN set -eux; \
/usr/local/go/src/cmd/dist/dist \
"$GOCACHE" \
; \
+ elif [ "$arch" = 'armv7' ]; then \
+ [ -s /usr/local/go/go.env ]; \
+ before="$(go env GOARM)"; [ "$before" != '7' ]; \
+ { \
+ echo; \
+ echo '# https://github.com/docker-library/golang/issues/494'; \
+ echo 'GOARM=7'; \
+ } >> /usr/local/go/go.env; \
+ after="$(go env GOARM)"; [ "$after" = '7' ]; \
fi; \
\
apk del --no-network .fetch-deps; \
diff --git a/golang_bookworm/Dockerfile b/golang_bookworm/Dockerfile
index 102e1c6..def7f93 100644
--- a/golang_bookworm/Dockerfile
+++ b/golang_bookworm/Dockerfile
@@ -120,6 +120,15 @@ RUN set -eux; \
/usr/local/go/src/cmd/dist/dist \
"$GOCACHE" \
; \
+ elif [ "$arch" = 'armhf' ]; then \
+ [ -s /usr/local/go/go.env ]; \
+ before="$(go env GOARM)"; [ "$before" != '7' ]; \
+ { \
+ echo; \
+ echo '# https://github.com/docker-library/golang/issues/494'; \
+ echo 'GOARM=7'; \
+ } >> /usr/local/go/go.env; \
+ after="$(go env GOARM)"; [ "$after" = '7' ]; \
fi; \
\
go version
diff --git a/golang_bullseye/Dockerfile b/golang_bullseye/Dockerfile
index 9ad380f..0b1349c 100644
--- a/golang_bullseye/Dockerfile
+++ b/golang_bullseye/Dockerfile
@@ -126,6 +126,15 @@ RUN set -eux; \
/usr/local/go/src/cmd/dist/dist \
"$GOCACHE" \
; \
+ elif [ "$arch" = 'armhf' ]; then \
+ [ -s /usr/local/go/go.env ]; \
+ before="$(go env GOARM)"; [ "$before" != '7' ]; \
+ { \
+ echo; \
+ echo '# https://github.com/docker-library/golang/issues/494'; \
+ echo 'GOARM=7'; \
+ } >> /usr/local/go/go.env; \
+ after="$(go env GOARM)"; [ "$after" = '7' ]; \
fi; \
\
go versionRelevant Maintainers: |
yosifkit
approved these changes
Dec 9, 2023
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: