-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update golang #18033
Merged
Merged
Update golang #18033
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@e023328: Merge pull request docker-library/golang#542 from jnoordsij/alpine3.21 - docker-library/golang@8e03f83: Add Alpine 3.21 and drop 3.19
Diff for f42c2f0:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 941660a..03bb2dd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,16 +2,16 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <yosi
GitRepo: https://github.com/docker-library/golang.git
Builder: buildkit
-Tags: 1.22.10-alpine3.19, 1.22-alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: d4dc5390de500bed26f0728a3458580e65f5b6c4
-Directory: 1.22/alpine3.19
-
-Tags: 1.22.10-alpine3.20, 1.22-alpine3.20, 1.22.10-alpine, 1.22-alpine
+Tags: 1.22.10-alpine3.20, 1.22-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: d4dc5390de500bed26f0728a3458580e65f5b6c4
Directory: 1.22/alpine3.20
+Tags: 1.22.10-alpine3.21, 1.22-alpine3.21, 1.22.10-alpine, 1.22-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 8e03f834d58f58e01b504a9ddd4e672173720f81
+Directory: 1.22/alpine3.21
+
Tags: 1.22.10-bookworm, 1.22-bookworm
SharedTags: 1.22.10, 1.22
Architectures: amd64, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -55,16 +55,16 @@ Directory: 1.22/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 1.23.4-alpine3.19, 1.23-alpine3.19, 1-alpine3.19, alpine3.19
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7db81882d183714657225ba6081ce0e9a0db9b75
-Directory: 1.23/alpine3.19
-
-Tags: 1.23.4-alpine3.20, 1.23-alpine3.20, 1-alpine3.20, alpine3.20, 1.23.4-alpine, 1.23-alpine, 1-alpine, alpine
+Tags: 1.23.4-alpine3.20, 1.23-alpine3.20, 1-alpine3.20, alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 7db81882d183714657225ba6081ce0e9a0db9b75
Directory: 1.23/alpine3.20
+Tags: 1.23.4-alpine3.21, 1.23-alpine3.21, 1-alpine3.21, alpine3.21, 1.23.4-alpine, 1.23-alpine, 1-alpine, alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 8e03f834d58f58e01b504a9ddd4e672173720f81
+Directory: 1.23/alpine3.21
+
Tags: 1.23.4-bookworm, 1.23-bookworm, 1-bookworm, bookworm
SharedTags: 1.23.4, 1.23, 1, latest
Architectures: amd64, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index f5fbfef..a3eefb9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
golang:1
golang:1-alpine
-golang:1-alpine3.19
golang:1-alpine3.20
+golang:1-alpine3.21
golang:1-bookworm
golang:1-bullseye
golang:1-nanoserver
@@ -12,8 +12,8 @@ golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2022
golang:1.22
golang:1.22-alpine
-golang:1.22-alpine3.19
golang:1.22-alpine3.20
+golang:1.22-alpine3.21
golang:1.22-bookworm
golang:1.22-bullseye
golang:1.22-nanoserver
@@ -24,8 +24,8 @@ golang:1.22-windowsservercore-1809
golang:1.22-windowsservercore-ltsc2022
golang:1.22.10
golang:1.22.10-alpine
-golang:1.22.10-alpine3.19
golang:1.22.10-alpine3.20
+golang:1.22.10-alpine3.21
golang:1.22.10-bookworm
golang:1.22.10-bullseye
golang:1.22.10-nanoserver
@@ -36,8 +36,8 @@ golang:1.22.10-windowsservercore-1809
golang:1.22.10-windowsservercore-ltsc2022
golang:1.23
golang:1.23-alpine
-golang:1.23-alpine3.19
golang:1.23-alpine3.20
+golang:1.23-alpine3.21
golang:1.23-bookworm
golang:1.23-bullseye
golang:1.23-nanoserver
@@ -48,8 +48,8 @@ golang:1.23-windowsservercore-1809
golang:1.23-windowsservercore-ltsc2022
golang:1.23.4
golang:1.23.4-alpine
-golang:1.23.4-alpine3.19
golang:1.23.4-alpine3.20
+golang:1.23.4-alpine3.21
golang:1.23.4-bookworm
golang:1.23.4-bullseye
golang:1.23.4-nanoserver
@@ -59,8 +59,8 @@ golang:1.23.4-windowsservercore
golang:1.23.4-windowsservercore-1809
golang:1.23.4-windowsservercore-ltsc2022
golang:alpine
-golang:alpine3.19
golang:alpine3.20
+golang:alpine3.21
golang:bookworm
golang:bullseye
golang:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index fd0c92a..cfdb084 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,11 +1,11 @@
golang:1.22-alpine
-golang:1.22-alpine3.19
+golang:1.22-alpine3.20
golang:1.22-bookworm
golang:1.22-bullseye
golang:1.22-windowsservercore-1809
golang:1.22-windowsservercore-ltsc2022
golang:alpine
-golang:alpine3.19
+golang:alpine3.20
golang:bookworm
golang:bullseye
golang:windowsservercore-1809
diff --git a/golang_1.22-alpine/Dockerfile b/golang_1.22-alpine/Dockerfile
index f9ccee9..a5e2e0f 100644
--- a/golang_1.22-alpine/Dockerfile
+++ b/golang_1.22-alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.20 AS build
+FROM alpine:3.21 AS build
ENV PATH /usr/local/go/bin:$PATH
@@ -110,7 +110,7 @@ RUN set -eux; \
[ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \
find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' +
-FROM alpine:3.20
+FROM alpine:3.21
RUN apk add --no-cache ca-certificates
diff --git a/golang_1.22-alpine3.19/Dockerfile b/golang_1.22-alpine3.19/Dockerfile
deleted file mode 100644
index c350ca3..0000000
diff --git a/golang_1.22-alpine/Dockerfile b/golang_1.22-alpine3.20/Dockerfile
similarity index 100%
copy from golang_1.22-alpine/Dockerfile
copy to golang_1.22-alpine3.20/Dockerfile
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 8e3444a..fa4bc73 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.20 AS build
+FROM alpine:3.21 AS build
ENV PATH /usr/local/go/bin:$PATH
@@ -110,7 +110,7 @@ RUN set -eux; \
[ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \
find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' +
-FROM alpine:3.20
+FROM alpine:3.21
RUN apk add --no-cache ca-certificates
diff --git a/golang_alpine3.19/Dockerfile b/golang_alpine3.19/Dockerfile
deleted file mode 100644
index 3e60145..0000000
diff --git a/golang_alpine/Dockerfile b/golang_alpine3.20/Dockerfile
similarity index 100%
copy from golang_alpine/Dockerfile
copy to golang_alpine3.20/Dockerfile Relevant Maintainers: |
tianon
approved these changes
Dec 6, 2024
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: