Skip to content
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 #14638

Merged
merged 1 commit into from
May 11, 2023
Merged

Update golang #14638

merged 1 commit into from
May 11, 2023

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/golang@713124c: Merge pull request docker-library/golang#460 from timothysteward-wk/alpine3.18
- docker-library/golang@03d21ef: Add support for alpine 3.18, remove alpine 3.16
@github-actions
Copy link

Diff for 0e4f9aa:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 34a6707..68c0b35 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.19.9-alpine3.16, 1.19-alpine3.16
+Tags: 1.19.9-alpine3.17, 1.19-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 94d54011065e97aa42d411b71dde8b2764fc0ac7
-Directory: 1.19/alpine3.16
+Directory: 1.19/alpine3.17
 
-Tags: 1.19.9-alpine3.17, 1.19-alpine3.17, 1.19.9-alpine, 1.19-alpine
+Tags: 1.19.9-alpine3.18, 1.19-alpine3.18, 1.19.9-alpine, 1.19-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 94d54011065e97aa42d411b71dde8b2764fc0ac7
-Directory: 1.19/alpine3.17
+GitCommit: 03d21ef7daf1f356142dcfaed18febf36efd391e
+Directory: 1.19/alpine3.18
 
 Tags: 1.19.9-bullseye, 1.19-bullseye
 SharedTags: 1.19.9, 1.19
@@ -50,15 +50,15 @@ GitCommit: 94d54011065e97aa42d411b71dde8b2764fc0ac7
 Directory: 1.19/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 1.20.4-alpine3.16, 1.20-alpine3.16, 1-alpine3.16, alpine3.16
+Tags: 1.20.4-alpine3.17, 1.20-alpine3.17, 1-alpine3.17, alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 5c6fa89055275c8f182ce96af9f5cde8399bdf76
-Directory: 1.20/alpine3.16
+Directory: 1.20/alpine3.17
 
-Tags: 1.20.4-alpine3.17, 1.20-alpine3.17, 1-alpine3.17, alpine3.17, 1.20.4-alpine, 1.20-alpine, 1-alpine, alpine
+Tags: 1.20.4-alpine3.18, 1.20-alpine3.18, 1-alpine3.18, alpine3.18, 1.20.4-alpine, 1.20-alpine, 1-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5c6fa89055275c8f182ce96af9f5cde8399bdf76
-Directory: 1.20/alpine3.17
+GitCommit: 03d21ef7daf1f356142dcfaed18febf36efd391e
+Directory: 1.20/alpine3.18
 
 Tags: 1.20.4-bullseye, 1.20-bullseye, 1-bullseye, bullseye
 SharedTags: 1.20.4, 1.20, 1, latest
diff --git a/_bashbrew-list b/_bashbrew-list
index 847fa7e..d60bc71 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 golang:1
 golang:1-alpine
-golang:1-alpine3.16
 golang:1-alpine3.17
+golang:1-alpine3.18
 golang:1-bullseye
 golang:1-buster
 golang:1-nanoserver
@@ -12,8 +12,8 @@ golang:1-windowsservercore-1809
 golang:1-windowsservercore-ltsc2022
 golang:1.19
 golang:1.19-alpine
-golang:1.19-alpine3.16
 golang:1.19-alpine3.17
+golang:1.19-alpine3.18
 golang:1.19-bullseye
 golang:1.19-buster
 golang:1.19-nanoserver
@@ -24,8 +24,8 @@ golang:1.19-windowsservercore-1809
 golang:1.19-windowsservercore-ltsc2022
 golang:1.19.9
 golang:1.19.9-alpine
-golang:1.19.9-alpine3.16
 golang:1.19.9-alpine3.17
+golang:1.19.9-alpine3.18
 golang:1.19.9-bullseye
 golang:1.19.9-buster
 golang:1.19.9-nanoserver
@@ -36,8 +36,8 @@ golang:1.19.9-windowsservercore-1809
 golang:1.19.9-windowsservercore-ltsc2022
 golang:1.20
 golang:1.20-alpine
-golang:1.20-alpine3.16
 golang:1.20-alpine3.17
+golang:1.20-alpine3.18
 golang:1.20-bullseye
 golang:1.20-buster
 golang:1.20-nanoserver
@@ -48,8 +48,8 @@ golang:1.20-windowsservercore-1809
 golang:1.20-windowsservercore-ltsc2022
 golang:1.20.4
 golang:1.20.4-alpine
-golang:1.20.4-alpine3.16
 golang:1.20.4-alpine3.17
+golang:1.20.4-alpine3.18
 golang:1.20.4-bullseye
 golang:1.20.4-buster
 golang:1.20.4-nanoserver
@@ -59,8 +59,8 @@ golang:1.20.4-windowsservercore
 golang:1.20.4-windowsservercore-1809
 golang:1.20.4-windowsservercore-ltsc2022
 golang:alpine
-golang:alpine3.16
 golang:alpine3.17
+golang:alpine3.18
 golang:bullseye
 golang:buster
 golang:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 7a4eaf6..c8353b3 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,10 +1,10 @@
-golang:1.19-alpine3.16
+golang:1.19-alpine3.17
 golang:1.19-alpine
 golang:1.19-bullseye
 golang:1.19-buster
 golang:1.19-windowsservercore-1809
 golang:1.19-windowsservercore-ltsc2022
-golang:alpine3.16
+golang:alpine3.17
 golang:alpine
 golang:bullseye
 golang:buster
diff --git a/golang_1.19-alpine/Dockerfile b/golang_1.19-alpine/Dockerfile
index 769b19f..6974efc 100644
--- a/golang_1.19-alpine/Dockerfile
+++ b/golang_1.19-alpine/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
 
diff --git a/golang_1.19-alpine3.16/Dockerfile b/golang_1.19-alpine3.16/Dockerfile
deleted file mode 100644
index ebf5f96..0000000
diff --git a/golang_1.19-alpine/Dockerfile b/golang_1.19-alpine3.17/Dockerfile
similarity index 100%
copy from golang_1.19-alpine/Dockerfile
copy to golang_1.19-alpine3.17/Dockerfile
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 9695f45..be71dfc 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/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
 
diff --git a/golang_alpine3.16/Dockerfile b/golang_alpine3.16/Dockerfile
deleted file mode 100644
index a74f140..0000000
diff --git a/golang_alpine/Dockerfile b/golang_alpine3.17/Dockerfile
similarity index 100%
copy from golang_alpine/Dockerfile
copy to golang_alpine3.17/Dockerfile

Relevant Maintainers:

@tianon tianon merged commit 016f61b into docker-library:master May 11, 2023
@tianon tianon deleted the golang branch May 11, 2023 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants