Update golang #13635
Merged
Update golang #13635
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@c5ab9e5: Merge pull request docker-library/golang#442 from squizzi/add_alpine_317 - docker-library/golang@d66a926: Add support for alpine 3.17, remove alpine 3.15 - docker-library/golang@326acd5: Use new "bashbrew" composite action
Diff for edb6c36:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b9859e7..1cf35bb 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.18.8-alpine3.15, 1.18-alpine3.15
+Tags: 1.18.8-alpine3.16, 1.18-alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9c8662f4c9726d8a13d83a4ca394e1ddbcf2a5c
-Directory: 1.18/alpine3.15
+GitCommit: d66a926ed0c800594ce37c4c949ab4ece231c4af
+Directory: 1.18/alpine3.16
-Tags: 1.18.8-alpine3.16, 1.18-alpine3.16, 1.18.8-alpine, 1.18-alpine
+Tags: 1.18.8-alpine3.17, 1.18-alpine3.17, 1.18.8-alpine, 1.18-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9c8662f4c9726d8a13d83a4ca394e1ddbcf2a5c
-Directory: 1.18/alpine3.16
+GitCommit: d66a926ed0c800594ce37c4c949ab4ece231c4af
+Directory: 1.18/alpine3.17
Tags: 1.18.8-bullseye, 1.18-bullseye
SharedTags: 1.18.8, 1.18
@@ -36,15 +36,15 @@ GitCommit: 0a2ec6cac5368744f0cc69028322dc5cebdb9f27
Directory: 1.18/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 1.19.3-alpine3.15, 1.19-alpine3.15, 1-alpine3.15, alpine3.15
+Tags: 1.19.3-alpine3.16, 1.19-alpine3.16, 1-alpine3.16, alpine3.16
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9c8662f4c9726d8a13d83a4ca394e1ddbcf2a5c
-Directory: 1.19/alpine3.15
+GitCommit: d66a926ed0c800594ce37c4c949ab4ece231c4af
+Directory: 1.19/alpine3.16
-Tags: 1.19.3-alpine3.16, 1.19-alpine3.16, 1-alpine3.16, alpine3.16, 1.19.3-alpine, 1.19-alpine, 1-alpine, alpine
+Tags: 1.19.3-alpine3.17, 1.19-alpine3.17, 1-alpine3.17, alpine3.17, 1.19.3-alpine, 1.19-alpine, 1-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9c8662f4c9726d8a13d83a4ca394e1ddbcf2a5c
-Directory: 1.19/alpine3.16
+GitCommit: d66a926ed0c800594ce37c4c949ab4ece231c4af
+Directory: 1.19/alpine3.17
Tags: 1.19.3-bullseye, 1.19-bullseye, 1-bullseye, bullseye
SharedTags: 1.19.3, 1.19, 1, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index aaaa6c1..75202a4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
golang:1
golang:1-alpine
-golang:1-alpine3.15
golang:1-alpine3.16
+golang:1-alpine3.17
golang:1-bullseye
golang:1-buster
golang:1-nanoserver
@@ -12,8 +12,8 @@ golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2022
golang:1.18
golang:1.18-alpine
-golang:1.18-alpine3.15
golang:1.18-alpine3.16
+golang:1.18-alpine3.17
golang:1.18-bullseye
golang:1.18-buster
golang:1.18-nanoserver
@@ -24,8 +24,8 @@ golang:1.18-windowsservercore-1809
golang:1.18-windowsservercore-ltsc2022
golang:1.18.8
golang:1.18.8-alpine
-golang:1.18.8-alpine3.15
golang:1.18.8-alpine3.16
+golang:1.18.8-alpine3.17
golang:1.18.8-bullseye
golang:1.18.8-buster
golang:1.18.8-nanoserver
@@ -36,8 +36,8 @@ golang:1.18.8-windowsservercore-1809
golang:1.18.8-windowsservercore-ltsc2022
golang:1.19
golang:1.19-alpine
-golang:1.19-alpine3.15
golang:1.19-alpine3.16
+golang:1.19-alpine3.17
golang:1.19-bullseye
golang:1.19-buster
golang:1.19-nanoserver
@@ -48,8 +48,8 @@ golang:1.19-windowsservercore-1809
golang:1.19-windowsservercore-ltsc2022
golang:1.19.3
golang:1.19.3-alpine
-golang:1.19.3-alpine3.15
golang:1.19.3-alpine3.16
+golang:1.19.3-alpine3.17
golang:1.19.3-bullseye
golang:1.19.3-buster
golang:1.19.3-nanoserver
@@ -59,8 +59,8 @@ golang:1.19.3-windowsservercore
golang:1.19.3-windowsservercore-1809
golang:1.19.3-windowsservercore-ltsc2022
golang:alpine
-golang:alpine3.15
golang:alpine3.16
+golang:alpine3.17
golang:bullseye
golang:buster
golang:latest
diff --git a/golang_1.18-alpine/Dockerfile b/golang_1.18-alpine/Dockerfile
index 6068d40..85ae371 100644
--- a/golang_1.18-alpine/Dockerfile
+++ b/golang_1.18-alpine/Dockerfile
@@ -4,21 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.16
+FROM alpine:3.17
RUN apk add --no-cache ca-certificates
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
- if [ -e /etc/nsswitch.conf ]; then \
- grep '^hosts: files dns' /etc/nsswitch.conf; \
- else \
- echo 'hosts: files dns' > /etc/nsswitch.conf; \
- fi
-
ENV PATH /usr/local/go/bin:$PATH
ENV GOLANG_VERSION 1.18.8
diff --git a/golang_1.18-alpine3.15/Dockerfile b/golang_1.18-alpine3.16/Dockerfile
similarity index 87%
rename from golang_1.18-alpine3.15/Dockerfile
rename to golang_1.18-alpine3.16/Dockerfile
index 85bcb0d..0a03b32 100644
--- a/golang_1.18-alpine3.15/Dockerfile
+++ b/golang_1.18-alpine3.16/Dockerfile
@@ -4,21 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.15
+FROM alpine:3.16
RUN apk add --no-cache ca-certificates
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
- if [ -e /etc/nsswitch.conf ]; then \
- grep '^hosts: files dns' /etc/nsswitch.conf; \
- else \
- echo 'hosts: files dns' > /etc/nsswitch.conf; \
- fi
-
ENV PATH /usr/local/go/bin:$PATH
ENV GOLANG_VERSION 1.18.8
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 13414f1..8c46c0f 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -4,21 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.16
+FROM alpine:3.17
RUN apk add --no-cache ca-certificates
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
- if [ -e /etc/nsswitch.conf ]; then \
- grep '^hosts: files dns' /etc/nsswitch.conf; \
- else \
- echo 'hosts: files dns' > /etc/nsswitch.conf; \
- fi
-
ENV PATH /usr/local/go/bin:$PATH
ENV GOLANG_VERSION 1.19.3
diff --git a/golang_alpine3.15/Dockerfile b/golang_alpine3.16/Dockerfile
similarity index 88%
rename from golang_alpine3.15/Dockerfile
rename to golang_alpine3.16/Dockerfile
index 2cfe9d2..fca33e6 100644
--- a/golang_alpine3.15/Dockerfile
+++ b/golang_alpine3.16/Dockerfile
@@ -4,21 +4,10 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM alpine:3.15
+FROM alpine:3.16
RUN apk add --no-cache ca-certificates
-# ensure that nsswitch.conf is set up for Go's "netgo" implementation
-# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303
-# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf
-# Alpine 3.16 includes nsswitch.conf
-RUN set -eux; \
- if [ -e /etc/nsswitch.conf ]; then \
- grep '^hosts: files dns' /etc/nsswitch.conf; \
- else \
- echo 'hosts: files dns' > /etc/nsswitch.conf; \
- fi
-
ENV PATH /usr/local/go/bin:$PATH
ENV GOLANG_VERSION 1.19.3Relevant Maintainers: |
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: