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 #15424

Merged
merged 1 commit into from
Sep 26, 2023
Merged

Update golang #15424

merged 1 commit into from
Sep 26, 2023

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/golang@377e297: Merge pull request docker-library/golang#491 from infosiftr/gotoolchain
- docker-library/golang@b643595: Set `GOTOOLCHAIN` to prevent go auto-upgrade
@github-actions
Copy link

Diff for 28e57eb:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index c6bbd6d..37e092d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -52,23 +52,23 @@ Constraints: windowsservercore-ltsc2022
 
 Tags: 1.21.1-alpine3.17, 1.21-alpine3.17, 1-alpine3.17, alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 585c8c1e705a7a458455f0629922a4f90628ce08
+GitCommit: b643595f97209e0e67f0cf62e13d4fb6c609451b
 Directory: 1.21/alpine3.17
 
 Tags: 1.21.1-alpine3.18, 1.21-alpine3.18, 1-alpine3.18, alpine3.18, 1.21.1-alpine, 1.21-alpine, 1-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 585c8c1e705a7a458455f0629922a4f90628ce08
+GitCommit: b643595f97209e0e67f0cf62e13d4fb6c609451b
 Directory: 1.21/alpine3.18
 
 Tags: 1.21.1-bookworm, 1.21-bookworm, 1-bookworm, bookworm
 SharedTags: 1.21.1, 1.21, 1, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 585c8c1e705a7a458455f0629922a4f90628ce08
+GitCommit: b643595f97209e0e67f0cf62e13d4fb6c609451b
 Directory: 1.21/bookworm
 
 Tags: 1.21.1-bullseye, 1.21-bullseye, 1-bullseye, bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 585c8c1e705a7a458455f0629922a4f90628ce08
+GitCommit: b643595f97209e0e67f0cf62e13d4fb6c609451b
 Directory: 1.21/bullseye
 
 Tags: 1.21.1-nanoserver-1809, 1.21-nanoserver-1809, 1-nanoserver-1809, nanoserver-1809
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 37eaad7..3a4479c 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -118,6 +118,10 @@ RUN set -eux; \
 	\
 	go version
 
+# don't auto-upgrade the gotoolchain
+# https://github.com/docker-library/golang/issues/472
+ENV GOTOOLCHAIN=local
+
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"
diff --git a/golang_alpine3.17/Dockerfile b/golang_alpine3.17/Dockerfile
index 2db0420..1af06fb 100644
--- a/golang_alpine3.17/Dockerfile
+++ b/golang_alpine3.17/Dockerfile
@@ -118,6 +118,10 @@ RUN set -eux; \
 	\
 	go version
 
+# don't auto-upgrade the gotoolchain
+# https://github.com/docker-library/golang/issues/472
+ENV GOTOOLCHAIN=local
+
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"
diff --git a/golang_bookworm/Dockerfile b/golang_bookworm/Dockerfile
index 1cb6b05..2603d3f 100644
--- a/golang_bookworm/Dockerfile
+++ b/golang_bookworm/Dockerfile
@@ -124,6 +124,10 @@ RUN set -eux; \
 	\
 	go version
 
+# don't auto-upgrade the gotoolchain
+# https://github.com/docker-library/golang/issues/472
+ENV GOTOOLCHAIN=local
+
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"
diff --git a/golang_bullseye/Dockerfile b/golang_bullseye/Dockerfile
index fb43eb8..cc549c6 100644
--- a/golang_bullseye/Dockerfile
+++ b/golang_bullseye/Dockerfile
@@ -130,6 +130,10 @@ RUN set -eux; \
 	\
 	go version
 
+# don't auto-upgrade the gotoolchain
+# https://github.com/docker-library/golang/issues/472
+ENV GOTOOLCHAIN=local
+
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:$PATH
 RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 1777 "$GOPATH"

Relevant Maintainers:

@yosifkit yosifkit merged commit dd4547e into docker-library:master Sep 26, 2023
@yosifkit yosifkit deleted the golang branch September 26, 2023 23:55
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.

None yet

3 participants