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

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Update golang #15040

merged 1 commit into from
Jul 17, 2023

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/golang@105ef08: Update 1.21-rc to 1.21rc3
- docker-library/golang@3c5b74f: Merge pull request docker-library/golang#475 from infosiftr/versions-arches
- docker-library/golang@34cdec3: Move "arches normalization" code down so it happens more consistently (for both "supported" and "missing" arches)
@github-actions
Copy link

Diff for 62dcc16:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0624120..0d71306 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -99,51 +99,51 @@ GitCommit: bba543aacac120bf09b371bd1b41496f3d2ea89d
 Directory: 1.20/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 1.21rc2-alpine3.17, 1.21-rc-alpine3.17
+Tags: 1.21rc3-alpine3.17, 1.21-rc-alpine3.17
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 431c08ffa8fdcb3dd1a1e1d6fd48b8788570a7cc
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/alpine3.17
 
-Tags: 1.21rc2-alpine3.18, 1.21-rc-alpine3.18, 1.21rc2-alpine, 1.21-rc-alpine
+Tags: 1.21rc3-alpine3.18, 1.21-rc-alpine3.18, 1.21rc3-alpine, 1.21-rc-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 431c08ffa8fdcb3dd1a1e1d6fd48b8788570a7cc
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/alpine3.18
 
-Tags: 1.21rc2-bookworm, 1.21-rc-bookworm
-SharedTags: 1.21rc2, 1.21-rc
+Tags: 1.21rc3-bookworm, 1.21-rc-bookworm
+SharedTags: 1.21rc3, 1.21-rc
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/bookworm
 
-Tags: 1.21rc2-bullseye, 1.21-rc-bullseye
+Tags: 1.21rc3-bullseye, 1.21-rc-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/bullseye
 
-Tags: 1.21rc2-nanoserver-1809, 1.21-rc-nanoserver-1809
-SharedTags: 1.21rc2-nanoserver, 1.21-rc-nanoserver
+Tags: 1.21rc3-nanoserver-1809, 1.21-rc-nanoserver-1809
+SharedTags: 1.21rc3-nanoserver, 1.21-rc-nanoserver
 Architectures: windows-amd64
-GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/windows/nanoserver-1809
 Constraints: nanoserver-1809, windowsservercore-1809
 
-Tags: 1.21rc2-nanoserver-ltsc2022, 1.21-rc-nanoserver-ltsc2022
-SharedTags: 1.21rc2-nanoserver, 1.21-rc-nanoserver
+Tags: 1.21rc3-nanoserver-ltsc2022, 1.21-rc-nanoserver-ltsc2022
+SharedTags: 1.21rc3-nanoserver, 1.21-rc-nanoserver
 Architectures: windows-amd64
-GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/windows/nanoserver-ltsc2022
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
-Tags: 1.21rc2-windowsservercore-1809, 1.21-rc-windowsservercore-1809
-SharedTags: 1.21rc2-windowsservercore, 1.21-rc-windowsservercore, 1.21rc2, 1.21-rc
+Tags: 1.21rc3-windowsservercore-1809, 1.21-rc-windowsservercore-1809
+SharedTags: 1.21rc3-windowsservercore, 1.21-rc-windowsservercore, 1.21rc3, 1.21-rc
 Architectures: windows-amd64
-GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 1.21rc2-windowsservercore-ltsc2022, 1.21-rc-windowsservercore-ltsc2022
-SharedTags: 1.21rc2-windowsservercore, 1.21-rc-windowsservercore, 1.21rc2, 1.21-rc
+Tags: 1.21rc3-windowsservercore-ltsc2022, 1.21-rc-windowsservercore-ltsc2022
+SharedTags: 1.21rc3-windowsservercore, 1.21-rc-windowsservercore, 1.21rc3, 1.21-rc
 Architectures: windows-amd64
-GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+GitCommit: 105ef084889a9bd607fbc97aaded37a91a125787
 Directory: 1.21-rc/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index c13ed9a..3a393d1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -58,18 +58,18 @@ golang:1.20.6-nanoserver-ltsc2022
 golang:1.20.6-windowsservercore
 golang:1.20.6-windowsservercore-1809
 golang:1.20.6-windowsservercore-ltsc2022
-golang:1.21rc2
-golang:1.21rc2-alpine
-golang:1.21rc2-alpine3.17
-golang:1.21rc2-alpine3.18
-golang:1.21rc2-bookworm
-golang:1.21rc2-bullseye
-golang:1.21rc2-nanoserver
-golang:1.21rc2-nanoserver-1809
-golang:1.21rc2-nanoserver-ltsc2022
-golang:1.21rc2-windowsservercore
-golang:1.21rc2-windowsservercore-1809
-golang:1.21rc2-windowsservercore-ltsc2022
+golang:1.21rc3
+golang:1.21rc3-alpine
+golang:1.21rc3-alpine3.17
+golang:1.21rc3-alpine3.18
+golang:1.21rc3-bookworm
+golang:1.21rc3-bullseye
+golang:1.21rc3-nanoserver
+golang:1.21rc3-nanoserver-1809
+golang:1.21rc3-nanoserver-ltsc2022
+golang:1.21rc3-windowsservercore
+golang:1.21rc3-windowsservercore-1809
+golang:1.21rc3-windowsservercore-ltsc2022
 golang:1.21-rc
 golang:1.21-rc-alpine
 golang:1.21-rc-alpine3.17
diff --git a/golang_1.21-rc-alpine/Dockerfile b/golang_1.21-rc-alpine/Dockerfile
index cf79254..b358a62 100644
--- a/golang_1.21-rc-alpine/Dockerfile
+++ b/golang_1.21-rc-alpine/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add --no-cache ca-certificates
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
 RUN set -eux; \
 	apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -18,36 +18,36 @@ RUN set -eux; \
 	url=; \
 	case "$arch" in \
 		'x86_64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-amd64.tar.gz'; \
-			sha256='8fe90332727c606019e80a7368e23f5e65ad59520e45ee4010692f15572e45c6'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-amd64.tar.gz'; \
+			sha256='b5e3a28d10ba1109cf0549237f2739284a0db2ce6bdc76cd03c4b26304c1a921'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
-			sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-armv6l.tar.gz'; \
+			sha256='928b43cde3485005d30dad132142bea733a7227a3942d9832b896d9282ef8dc1'; \
 			;; \
 		'armv7') \
-			url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
-			sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-armv6l.tar.gz'; \
+			sha256='928b43cde3485005d30dad132142bea733a7227a3942d9832b896d9282ef8dc1'; \
 			;; \
 		'aarch64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-arm64.tar.gz'; \
-			sha256='30a6518ca5f816c0fef5b2cc16b960e999b98b16f7d69f995f74236cc00aa292'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-arm64.tar.gz'; \
+			sha256='8891193758aed49daedff3f519b12f81e15a947170437a9109e3ff8c11d7f7e2'; \
 			;; \
 		'x86') \
-			url='https://dl.google.com/go/go1.21rc2.linux-386.tar.gz'; \
-			sha256='cf330c82e41cf766af5629772600d5ecd3d24faeacdba8ac1f5f33acc6590175'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-386.tar.gz'; \
+			sha256='96a0b0fb4b65db37a265d5758d007ad25c6ba9d29470c0012c6cb9c714be813f'; \
 			;; \
 		'ppc64le') \
-			url='https://dl.google.com/go/go1.21rc2.linux-ppc64le.tar.gz'; \
-			sha256='8c3a2674cf57c304ed1a8f4e0a6184ad85fd5760a04dea608fdcaca7ad863027'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-ppc64le.tar.gz'; \
+			sha256='10af108730b75174cd1db9919781de9119018a818c02588e2299554378428c6a'; \
 			;; \
 		'riscv64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-riscv64.tar.gz'; \
-			sha256='33ea0c09d1f10f034d9e4fbef4eaceb785f3433ba631eaacb01a0af40773b673'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-riscv64.tar.gz'; \
+			sha256='9b341bbea1ba2c75c06d1b903a7f398ed4b8e6ed31557f64397728d16068bfaf'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.21rc2.linux-s390x.tar.gz'; \
-			sha256='3fd1640c1f4c50dff412643cd61577d53c8241f1f2789605b1ff1048d2b36f95'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-s390x.tar.gz'; \
+			sha256='c6dc855976b74f21168f413be46d448de1fbb545cc9fb47895c4b62581e33724'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -55,8 +55,8 @@ RUN set -eux; \
 	if [ -z "$url" ]; then \
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
 		build=1; \
-		url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
-		sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
+		url='https://dl.google.com/go/go1.21rc3.src.tar.gz'; \
+		sha256='9de96a2f15196a9c69cb9ab122c9c2aaecca30ec9448caa71543eaeb19ca91ab'; \
 		echo >&2; \
 		echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
 		echo >&2; \
diff --git a/golang_1.21-rc-alpine3.17/Dockerfile b/golang_1.21-rc-alpine3.17/Dockerfile
index 0638972..da0ff35 100644
--- a/golang_1.21-rc-alpine3.17/Dockerfile
+++ b/golang_1.21-rc-alpine3.17/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add --no-cache ca-certificates
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
 RUN set -eux; \
 	apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -18,36 +18,36 @@ RUN set -eux; \
 	url=; \
 	case "$arch" in \
 		'x86_64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-amd64.tar.gz'; \
-			sha256='8fe90332727c606019e80a7368e23f5e65ad59520e45ee4010692f15572e45c6'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-amd64.tar.gz'; \
+			sha256='b5e3a28d10ba1109cf0549237f2739284a0db2ce6bdc76cd03c4b26304c1a921'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
-			sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-armv6l.tar.gz'; \
+			sha256='928b43cde3485005d30dad132142bea733a7227a3942d9832b896d9282ef8dc1'; \
 			;; \
 		'armv7') \
-			url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
-			sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-armv6l.tar.gz'; \
+			sha256='928b43cde3485005d30dad132142bea733a7227a3942d9832b896d9282ef8dc1'; \
 			;; \
 		'aarch64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-arm64.tar.gz'; \
-			sha256='30a6518ca5f816c0fef5b2cc16b960e999b98b16f7d69f995f74236cc00aa292'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-arm64.tar.gz'; \
+			sha256='8891193758aed49daedff3f519b12f81e15a947170437a9109e3ff8c11d7f7e2'; \
 			;; \
 		'x86') \
-			url='https://dl.google.com/go/go1.21rc2.linux-386.tar.gz'; \
-			sha256='cf330c82e41cf766af5629772600d5ecd3d24faeacdba8ac1f5f33acc6590175'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-386.tar.gz'; \
+			sha256='96a0b0fb4b65db37a265d5758d007ad25c6ba9d29470c0012c6cb9c714be813f'; \
 			;; \
 		'ppc64le') \
-			url='https://dl.google.com/go/go1.21rc2.linux-ppc64le.tar.gz'; \
-			sha256='8c3a2674cf57c304ed1a8f4e0a6184ad85fd5760a04dea608fdcaca7ad863027'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-ppc64le.tar.gz'; \
+			sha256='10af108730b75174cd1db9919781de9119018a818c02588e2299554378428c6a'; \
 			;; \
 		'riscv64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-riscv64.tar.gz'; \
-			sha256='33ea0c09d1f10f034d9e4fbef4eaceb785f3433ba631eaacb01a0af40773b673'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-riscv64.tar.gz'; \
+			sha256='9b341bbea1ba2c75c06d1b903a7f398ed4b8e6ed31557f64397728d16068bfaf'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.21rc2.linux-s390x.tar.gz'; \
-			sha256='3fd1640c1f4c50dff412643cd61577d53c8241f1f2789605b1ff1048d2b36f95'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-s390x.tar.gz'; \
+			sha256='c6dc855976b74f21168f413be46d448de1fbb545cc9fb47895c4b62581e33724'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -55,8 +55,8 @@ RUN set -eux; \
 	if [ -z "$url" ]; then \
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
 		build=1; \
-		url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
-		sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
+		url='https://dl.google.com/go/go1.21rc3.src.tar.gz'; \
+		sha256='9de96a2f15196a9c69cb9ab122c9c2aaecca30ec9448caa71543eaeb19ca91ab'; \
 		echo >&2; \
 		echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
 		echo >&2; \
diff --git a/golang_1.21-rc-bookworm/Dockerfile b/golang_1.21-rc-bookworm/Dockerfile
index 9ece6f2..3660d7b 100644
--- a/golang_1.21-rc-bookworm/Dockerfile
+++ b/golang_1.21-rc-bookworm/Dockerfile
@@ -20,46 +20,46 @@ RUN set -eux; \
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
 RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
 	url=; \
 	case "$arch" in \
 		'amd64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-amd64.tar.gz'; \
-			sha256='8fe90332727c606019e80a7368e23f5e65ad59520e45ee4010692f15572e45c6'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-amd64.tar.gz'; \
+			sha256='b5e3a28d10ba1109cf0549237f2739284a0db2ce6bdc76cd03c4b26304c1a921'; \
 			;; \
 		'armel') \
 			export GOARCH='arm' GOARM='5' GOOS='linux'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
-			sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-armv6l.tar.gz'; \
+			sha256='928b43cde3485005d30dad132142bea733a7227a3942d9832b896d9282ef8dc1'; \
 			;; \
 		'arm64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-arm64.tar.gz'; \
-			sha256='30a6518ca5f816c0fef5b2cc16b960e999b98b16f7d69f995f74236cc00aa292'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-arm64.tar.gz'; \
+			sha256='8891193758aed49daedff3f519b12f81e15a947170437a9109e3ff8c11d7f7e2'; \
 			;; \
 		'i386') \
-			url='https://dl.google.com/go/go1.21rc2.linux-386.tar.gz'; \
-			sha256='cf330c82e41cf766af5629772600d5ecd3d24faeacdba8ac1f5f33acc6590175'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-386.tar.gz'; \
+			sha256='96a0b0fb4b65db37a265d5758d007ad25c6ba9d29470c0012c6cb9c714be813f'; \
 			;; \
 		'mips64el') \
-			url='https://dl.google.com/go/go1.21rc2.linux-mips64le.tar.gz'; \
-			sha256='918d7a64f8745e4c4674396b2160780c45a3f11b80fffc0cf01638a34b3a003d'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-mips64le.tar.gz'; \
+			sha256='b353400d59f1b72ec5dcf2f5ac7370b3b003305facfa54e728cfbb141c3049c0'; \
 			;; \
 		'ppc64el') \
-			url='https://dl.google.com/go/go1.21rc2.linux-ppc64le.tar.gz'; \
-			sha256='8c3a2674cf57c304ed1a8f4e0a6184ad85fd5760a04dea608fdcaca7ad863027'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-ppc64le.tar.gz'; \
+			sha256='10af108730b75174cd1db9919781de9119018a818c02588e2299554378428c6a'; \
 			;; \
 		'riscv64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-riscv64.tar.gz'; \
-			sha256='33ea0c09d1f10f034d9e4fbef4eaceb785f3433ba631eaacb01a0af40773b673'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-riscv64.tar.gz'; \
+			sha256='9b341bbea1ba2c75c06d1b903a7f398ed4b8e6ed31557f64397728d16068bfaf'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.21rc2.linux-s390x.tar.gz'; \
-			sha256='3fd1640c1f4c50dff412643cd61577d53c8241f1f2789605b1ff1048d2b36f95'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-s390x.tar.gz'; \
+			sha256='c6dc855976b74f21168f413be46d448de1fbb545cc9fb47895c4b62581e33724'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -67,8 +67,8 @@ RUN set -eux; \
 	if [ -z "$url" ]; then \
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
 		build=1; \
-		url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
-		sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
+		url='https://dl.google.com/go/go1.21rc3.src.tar.gz'; \
+		sha256='9de96a2f15196a9c69cb9ab122c9c2aaecca30ec9448caa71543eaeb19ca91ab'; \
 		echo >&2; \
 		echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
 		echo >&2; \
diff --git a/golang_1.21-rc-bullseye/Dockerfile b/golang_1.21-rc-bullseye/Dockerfile
index 9d4435c..4ff26dc 100644
--- a/golang_1.21-rc-bullseye/Dockerfile
+++ b/golang_1.21-rc-bullseye/Dockerfile
@@ -20,46 +20,46 @@ RUN set -eux; \
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
 RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
 	url=; \
 	case "$arch" in \
 		'amd64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-amd64.tar.gz'; \
-			sha256='8fe90332727c606019e80a7368e23f5e65ad59520e45ee4010692f15572e45c6'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-amd64.tar.gz'; \
+			sha256='b5e3a28d10ba1109cf0549237f2739284a0db2ce6bdc76cd03c4b26304c1a921'; \
 			;; \
 		'armel') \
 			export GOARCH='arm' GOARM='5' GOOS='linux'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
-			sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-armv6l.tar.gz'; \
+			sha256='928b43cde3485005d30dad132142bea733a7227a3942d9832b896d9282ef8dc1'; \
 			;; \
 		'arm64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-arm64.tar.gz'; \
-			sha256='30a6518ca5f816c0fef5b2cc16b960e999b98b16f7d69f995f74236cc00aa292'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-arm64.tar.gz'; \
+			sha256='8891193758aed49daedff3f519b12f81e15a947170437a9109e3ff8c11d7f7e2'; \
 			;; \
 		'i386') \
-			url='https://dl.google.com/go/go1.21rc2.linux-386.tar.gz'; \
-			sha256='cf330c82e41cf766af5629772600d5ecd3d24faeacdba8ac1f5f33acc6590175'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-386.tar.gz'; \
+			sha256='96a0b0fb4b65db37a265d5758d007ad25c6ba9d29470c0012c6cb9c714be813f'; \
 			;; \
 		'mips64el') \
-			url='https://dl.google.com/go/go1.21rc2.linux-mips64le.tar.gz'; \
-			sha256='918d7a64f8745e4c4674396b2160780c45a3f11b80fffc0cf01638a34b3a003d'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-mips64le.tar.gz'; \
+			sha256='b353400d59f1b72ec5dcf2f5ac7370b3b003305facfa54e728cfbb141c3049c0'; \
 			;; \
 		'ppc64el') \
-			url='https://dl.google.com/go/go1.21rc2.linux-ppc64le.tar.gz'; \
-			sha256='8c3a2674cf57c304ed1a8f4e0a6184ad85fd5760a04dea608fdcaca7ad863027'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-ppc64le.tar.gz'; \
+			sha256='10af108730b75174cd1db9919781de9119018a818c02588e2299554378428c6a'; \
 			;; \
 		'riscv64') \
-			url='https://dl.google.com/go/go1.21rc2.linux-riscv64.tar.gz'; \
-			sha256='33ea0c09d1f10f034d9e4fbef4eaceb785f3433ba631eaacb01a0af40773b673'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-riscv64.tar.gz'; \
+			sha256='9b341bbea1ba2c75c06d1b903a7f398ed4b8e6ed31557f64397728d16068bfaf'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.21rc2.linux-s390x.tar.gz'; \
-			sha256='3fd1640c1f4c50dff412643cd61577d53c8241f1f2789605b1ff1048d2b36f95'; \
+			url='https://dl.google.com/go/go1.21rc3.linux-s390x.tar.gz'; \
+			sha256='c6dc855976b74f21168f413be46d448de1fbb545cc9fb47895c4b62581e33724'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -67,8 +67,8 @@ RUN set -eux; \
 	if [ -z "$url" ]; then \
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
 		build=1; \
-		url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
-		sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
+		url='https://dl.google.com/go/go1.21rc3.src.tar.gz'; \
+		sha256='9de96a2f15196a9c69cb9ab122c9c2aaecca30ec9448caa71543eaeb19ca91ab'; \
 		echo >&2; \
 		echo >&2 "warning: current architecture ($arch) does not have a compatible Go binary release; will be building from source"; \
 		echo >&2; \
diff --git a/golang_1.21-rc-nanoserver-1809/Dockerfile b/golang_1.21-rc-nanoserver-1809/Dockerfile
index e73add3..82f919d 100644
--- a/golang_1.21-rc-nanoserver-1809/Dockerfile
+++ b/golang_1.21-rc-nanoserver-1809/Dockerfile
@@ -21,10 +21,10 @@ RUN setx /m PATH "%GOPATH%\bin;C:\Program Files\Go\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
 # Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.21rc2-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.21rc3-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_1.21-rc-nanoserver-ltsc2022/Dockerfile b/golang_1.21-rc-nanoserver-ltsc2022/Dockerfile
index 781499c..df64726 100644
--- a/golang_1.21-rc-nanoserver-ltsc2022/Dockerfile
+++ b/golang_1.21-rc-nanoserver-ltsc2022/Dockerfile
@@ -21,10 +21,10 @@ RUN setx /m PATH "%GOPATH%\bin;C:\Program Files\Go\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
 # Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.21rc2-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.21rc3-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_1.21-rc-windowsservercore-1809/Dockerfile b/golang_1.21-rc-windowsservercore-1809/Dockerfile
index 03f8fac..62de8f4 100644
--- a/golang_1.21-rc-windowsservercore-1809/Dockerfile
+++ b/golang_1.21-rc-windowsservercore-1809/Dockerfile
@@ -53,14 +53,14 @@ RUN $newPath = ('{0}\bin;C:\Program Files\Go\bin;{1}' -f $env:GOPATH, $env:PATH)
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
-RUN $url = 'https://dl.google.com/go/go1.21rc2.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.21rc3.windows-amd64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '766aab8c782b8ee833dbc81ed53ef1c23668dee0f955c32d85f66fda2ecadadf'; \
+	$sha256 = '85c3e5037c6515a1a6831c7848d1376854f38080a45d0bdc7e7dcd1e53e86b6c'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile b/golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile
index 4cddd82..2c6d59f 100644
--- a/golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile
+++ b/golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile
@@ -53,14 +53,14 @@ RUN $newPath = ('{0}\bin;C:\Program Files\Go\bin;{1}' -f $env:GOPATH, $env:PATH)
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.21rc2
+ENV GOLANG_VERSION 1.21rc3
 
-RUN $url = 'https://dl.google.com/go/go1.21rc2.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.21rc3.windows-amd64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '766aab8c782b8ee833dbc81ed53ef1c23668dee0f955c32d85f66fda2ecadadf'; \
+	$sha256 = '85c3e5037c6515a1a6831c7848d1376854f38080a45d0bdc7e7dcd1e53e86b6c'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 3a4f6bb into docker-library:master Jul 17, 2023
@yosifkit yosifkit deleted the golang branch July 17, 2023 23:53
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.

2 participants