Skip to content

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 10, 2021

Changes:

Changes:

- docker-library/golang@6a48eee: Merge pull request docker-library/golang#371 from infosiftr/1.17-rc
- docker-library/golang@94b50ae: Add 1.17-rc
@github-actions
Copy link

Diff for 2612490:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e929350..08bbbcf 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,12 +3,12 @@ GitRepo: https://github.com/docker-library/golang.git
 
 Tags: 1.15.13-alpine3.12, 1.15-alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 74370a4eaf301318abc7257a82bee06ad56f44d0
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
 Directory: 1.15/alpine3.12
 
 Tags: 1.15.13-alpine3.13, 1.15-alpine3.13, 1.15.13-alpine, 1.15-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 74370a4eaf301318abc7257a82bee06ad56f44d0
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
 Directory: 1.15/alpine3.13
 
 Tags: 1.15.13-buster, 1.15-buster
@@ -45,12 +45,12 @@ Constraints: windowsservercore-ltsc2016
 
 Tags: 1.16.5-alpine3.12, 1.16-alpine3.12, 1-alpine3.12, alpine3.12
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b879b60a7d94128c8fb5aea763cf31772495511d
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
 Directory: 1.16/alpine3.12
 
 Tags: 1.16.5-alpine3.13, 1.16-alpine3.13, 1-alpine3.13, alpine3.13, 1.16.5-alpine, 1.16-alpine, 1-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b879b60a7d94128c8fb5aea763cf31772495511d
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
 Directory: 1.16/alpine3.13
 
 Tags: 1.16.5-buster, 1.16-buster, 1-buster, buster
@@ -84,3 +84,45 @@ Architectures: windows-amd64
 GitCommit: b879b60a7d94128c8fb5aea763cf31772495511d
 Directory: 1.16/windows/windowsservercore-ltsc2016
 Constraints: windowsservercore-ltsc2016
+
+Tags: 1.17beta1-alpine3.12, 1.17-rc-alpine3.12, rc-alpine3.12
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
+Directory: 1.17-rc/alpine3.12
+
+Tags: 1.17beta1-alpine3.13, 1.17-rc-alpine3.13, rc-alpine3.13, 1.17beta1-alpine, 1.17-rc-alpine, rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
+Directory: 1.17-rc/alpine3.13
+
+Tags: 1.17beta1-buster, 1.17-rc-buster, rc-buster
+SharedTags: 1.17beta1, 1.17-rc, rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
+Directory: 1.17-rc/buster
+
+Tags: 1.17beta1-nanoserver-1809, 1.17-rc-nanoserver-1809, rc-nanoserver-1809
+SharedTags: 1.17beta1-nanoserver, 1.17-rc-nanoserver, rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
+Directory: 1.17-rc/windows/nanoserver-1809
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 1.17beta1-stretch, 1.17-rc-stretch, rc-stretch
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
+Directory: 1.17-rc/stretch
+
+Tags: 1.17beta1-windowsservercore-1809, 1.17-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 1.17beta1-windowsservercore, 1.17-rc-windowsservercore, rc-windowsservercore, 1.17beta1, 1.17-rc, rc
+Architectures: windows-amd64
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
+Directory: 1.17-rc/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
+
+Tags: 1.17beta1-windowsservercore-ltsc2016, 1.17-rc-windowsservercore-ltsc2016, rc-windowsservercore-ltsc2016
+SharedTags: 1.17beta1-windowsservercore, 1.17-rc-windowsservercore, rc-windowsservercore, 1.17beta1, 1.17-rc, rc
+Architectures: windows-amd64
+GitCommit: 94b50ae6a398dced36243c0f9034e168aa1ae833
+Directory: 1.17-rc/windows/windowsservercore-ltsc2016
+Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index 745a907..80b7b74 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -53,6 +53,28 @@ golang:1.16.5-stretch
 golang:1.16.5-windowsservercore
 golang:1.16.5-windowsservercore-1809
 golang:1.16.5-windowsservercore-ltsc2016
+golang:1.17beta1
+golang:1.17beta1-alpine
+golang:1.17beta1-alpine3.12
+golang:1.17beta1-alpine3.13
+golang:1.17beta1-buster
+golang:1.17beta1-nanoserver
+golang:1.17beta1-nanoserver-1809
+golang:1.17beta1-stretch
+golang:1.17beta1-windowsservercore
+golang:1.17beta1-windowsservercore-1809
+golang:1.17beta1-windowsservercore-ltsc2016
+golang:1.17-rc
+golang:1.17-rc-alpine
+golang:1.17-rc-alpine3.12
+golang:1.17-rc-alpine3.13
+golang:1.17-rc-buster
+golang:1.17-rc-nanoserver
+golang:1.17-rc-nanoserver-1809
+golang:1.17-rc-stretch
+golang:1.17-rc-windowsservercore
+golang:1.17-rc-windowsservercore-1809
+golang:1.17-rc-windowsservercore-ltsc2016
 golang:alpine
 golang:alpine3.12
 golang:alpine3.13
@@ -60,6 +82,17 @@ golang:buster
 golang:latest
 golang:nanoserver
 golang:nanoserver-1809
+golang:rc
+golang:rc-alpine
+golang:rc-alpine3.12
+golang:rc-alpine3.13
+golang:rc-buster
+golang:rc-nanoserver
+golang:rc-nanoserver-1809
+golang:rc-stretch
+golang:rc-windowsservercore
+golang:rc-windowsservercore-1809
+golang:rc-windowsservercore-ltsc2016
 golang:stretch
 golang:windowsservercore
 golang:windowsservercore-1809
diff --git a/golang_1.15-alpine/Dockerfile b/golang_1.15-alpine/Dockerfile
index cd66890..61dcb19 100644
--- a/golang_1.15-alpine/Dockerfile
+++ b/golang_1.15-alpine/Dockerfile
@@ -89,13 +89,13 @@ RUN set -eux; \
 		fi; \
 	); \
 	\
-	apk del --no-network .build-deps; \
-	\
 # pre-compile the standard library, just like the official binary release tarballs do
 	go install std; \
 # go install: -race is only supported on linux/amd64, linux/ppc64le, linux/arm64, freebsd/amd64, netbsd/amd64, darwin/amd64 and windows/amd64
 #	go install -race std; \
 	\
+	apk del --no-network .build-deps; \
+	\
 # remove a few intermediate / bootstrapping files the official binary release tarballs do not contain
 	rm -rf \
 		/usr/local/go/pkg/*/cmd \
diff --git a/golang_1.15-alpine3.12/Dockerfile b/golang_1.15-alpine3.12/Dockerfile
index ff56928..bd759ca 100644
--- a/golang_1.15-alpine3.12/Dockerfile
+++ b/golang_1.15-alpine3.12/Dockerfile
@@ -89,13 +89,13 @@ RUN set -eux; \
 		fi; \
 	); \
 	\
-	apk del --no-network .build-deps; \
-	\
 # pre-compile the standard library, just like the official binary release tarballs do
 	go install std; \
 # go install: -race is only supported on linux/amd64, linux/ppc64le, linux/arm64, freebsd/amd64, netbsd/amd64, darwin/amd64 and windows/amd64
 #	go install -race std; \
 	\
+	apk del --no-network .build-deps; \
+	\
 # remove a few intermediate / bootstrapping files the official binary release tarballs do not contain
 	rm -rf \
 		/usr/local/go/pkg/*/cmd \
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index f1274f4..de2b390 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -89,13 +89,13 @@ RUN set -eux; \
 		fi; \
 	); \
 	\
-	apk del --no-network .build-deps; \
-	\
 # pre-compile the standard library, just like the official binary release tarballs do
 	go install std; \
 # go install: -race is only supported on linux/amd64, linux/ppc64le, linux/arm64, freebsd/amd64, netbsd/amd64, darwin/amd64 and windows/amd64
 #	go install -race std; \
 	\
+	apk del --no-network .build-deps; \
+	\
 # remove a few intermediate / bootstrapping files the official binary release tarballs do not contain
 	rm -rf \
 		/usr/local/go/pkg/*/cmd \
diff --git a/golang_alpine3.12/Dockerfile b/golang_alpine3.12/Dockerfile
index 161d05c..d5d0ffd 100644
--- a/golang_alpine3.12/Dockerfile
+++ b/golang_alpine3.12/Dockerfile
@@ -89,13 +89,13 @@ RUN set -eux; \
 		fi; \
 	); \
 	\
-	apk del --no-network .build-deps; \
-	\
 # pre-compile the standard library, just like the official binary release tarballs do
 	go install std; \
 # go install: -race is only supported on linux/amd64, linux/ppc64le, linux/arm64, freebsd/amd64, netbsd/amd64, darwin/amd64 and windows/amd64
 #	go install -race std; \
 	\
+	apk del --no-network .build-deps; \
+	\
 # remove a few intermediate / bootstrapping files the official binary release tarballs do not contain
 	rm -rf \
 		/usr/local/go/pkg/*/cmd \
diff --git a/golang_alpine/Dockerfile b/golang_rc-alpine/Dockerfile
similarity index 95%
copy from golang_alpine/Dockerfile
copy to golang_rc-alpine/Dockerfile
index f1274f4..07ef8a9 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_rc-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.16.5
+ENV GOLANG_VERSION 1.17beta1
 
 RUN set -eux; \
 	apk add --no-cache --virtual .build-deps \
@@ -54,8 +54,8 @@ RUN set -eux; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
-	url='https://dl.google.com/go/go1.16.5.src.tar.gz'; \
-	sha256='7bfa7e5908c7cc9e75da5ddf3066d7cbcf3fd9fa51945851325eebc17f50ba80'; \
+	url='https://dl.google.com/go/go1.17beta1.src.tar.gz'; \
+	sha256='02b8973725f9bc545955865576e8c8f6ca672312f69fd9e5549c25b0ce1d75f0'; \
 	\
 	wget -O go.tgz.asc "$url.asc"; \
 	wget -O go.tgz "$url"; \
@@ -89,13 +89,13 @@ RUN set -eux; \
 		fi; \
 	); \
 	\
-	apk del --no-network .build-deps; \
-	\
 # pre-compile the standard library, just like the official binary release tarballs do
 	go install std; \
 # go install: -race is only supported on linux/amd64, linux/ppc64le, linux/arm64, freebsd/amd64, netbsd/amd64, darwin/amd64 and windows/amd64
 #	go install -race std; \
 	\
+	apk del --no-network .build-deps; \
+	\
 # remove a few intermediate / bootstrapping files the official binary release tarballs do not contain
 	rm -rf \
 		/usr/local/go/pkg/*/cmd \
diff --git a/golang_alpine3.12/Dockerfile b/golang_rc-alpine3.12/Dockerfile
similarity index 95%
copy from golang_alpine3.12/Dockerfile
copy to golang_rc-alpine3.12/Dockerfile
index 161d05c..49044d5 100644
--- a/golang_alpine3.12/Dockerfile
+++ b/golang_rc-alpine3.12/Dockerfile
@@ -16,7 +16,7 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.16.5
+ENV GOLANG_VERSION 1.17beta1
 
 RUN set -eux; \
 	apk add --no-cache --virtual .build-deps \
@@ -54,8 +54,8 @@ RUN set -eux; \
 	esac; \
 	\
 # https://github.com/golang/go/issues/38536#issuecomment-616897960
-	url='https://dl.google.com/go/go1.16.5.src.tar.gz'; \
-	sha256='7bfa7e5908c7cc9e75da5ddf3066d7cbcf3fd9fa51945851325eebc17f50ba80'; \
+	url='https://dl.google.com/go/go1.17beta1.src.tar.gz'; \
+	sha256='02b8973725f9bc545955865576e8c8f6ca672312f69fd9e5549c25b0ce1d75f0'; \
 	\
 	wget -O go.tgz.asc "$url.asc"; \
 	wget -O go.tgz "$url"; \
@@ -89,13 +89,13 @@ RUN set -eux; \
 		fi; \
 	); \
 	\
-	apk del --no-network .build-deps; \
-	\
 # pre-compile the standard library, just like the official binary release tarballs do
 	go install std; \
 # go install: -race is only supported on linux/amd64, linux/ppc64le, linux/arm64, freebsd/amd64, netbsd/amd64, darwin/amd64 and windows/amd64
 #	go install -race std; \
 	\
+	apk del --no-network .build-deps; \
+	\
 # remove a few intermediate / bootstrapping files the official binary release tarballs do not contain
 	rm -rf \
 		/usr/local/go/pkg/*/cmd \
diff --git a/golang_1.15-buster/Dockerfile b/golang_rc-buster/Dockerfile
similarity index 74%
copy from golang_1.15-buster/Dockerfile
copy to golang_rc-buster/Dockerfile
index f86c349..9d7934e 100644
--- a/golang_1.15-buster/Dockerfile
+++ b/golang_rc-buster/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.15.13
+ENV GOLANG_VERSION 1.17beta1
 
 RUN set -eux; \
 	\
@@ -25,34 +25,34 @@ RUN set -eux; \
 	url=; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://dl.google.com/go/go1.15.13.linux-amd64.tar.gz'; \
-			sha256='3d3beec5fc66659018e09f40abb7274b10794229ba7c1e8bdb7d8ca77b656a13'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-amd64.tar.gz'; \
+			sha256='a479681705b65971f9db079bfce53c4393bfa241d952eb09de88fb40677d3c4c'; \
 			;; \
 		'armel') \
 			export GOARCH='arm' GOARM='5' GOOS='linux'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.15.13.linux-armv6l.tar.gz'; \
-			sha256='00ff453f102c67ff6b790ba0cb10cecf73c8e8bbd9d913e5978ac8cc6323132f'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-armv6l.tar.gz'; \
+			sha256='f4ab69c75a1f9e43b07ca9a0bfdf68ca1e2b0b51d4ebfb8c79f60ed14629f4e6'; \
 			;; \
 		'arm64') \
-			url='https://dl.google.com/go/go1.15.13.linux-arm64.tar.gz'; \
-			sha256='f3989dca4dea5fbadfec253d7c24e4111773b203e677abb1f01e768a99cc14e6'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-arm64.tar.gz'; \
+			sha256='ede56f79c5061146929ab4a128e8ee7bc713d141e87b3df4e0aa670938e128b3'; \
 			;; \
 		'i386') \
-			url='https://dl.google.com/go/go1.15.13.linux-386.tar.gz'; \
-			sha256='8df80ccbbd57b108ec43066925bf02aac47bc9e0236894dbd019f26944d27399'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-386.tar.gz'; \
+			sha256='cebbf75985ba7e6f1a5b137916a6019685d52ecf36c262092ffc3f714cd85974'; \
 			;; \
 		'mips64el') \
 			export GOARCH='mips64le' GOOS='linux'; \
 			;; \
 		'ppc64el') \
-			url='https://dl.google.com/go/go1.15.13.linux-ppc64le.tar.gz'; \
-			sha256='1a27f62d8812c28700e49cae46b9a378410e9eb735c79b1722cbe685f1c72528'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-ppc64le.tar.gz'; \
+			sha256='0a6e5034fcbd4b38642b56841a042135aec1e87f61258d2d70aafc0a667bdd11'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.15.13.linux-s390x.tar.gz'; \
-			sha256='4448244965699706eff54d1f38917b8a896a27cf61a494f514818303c669a4b3'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-s390x.tar.gz'; \
+			sha256='3501d139a9433775001730f1d9c3fb60d7b93b969fe16bd80fc7387a3d5259b1'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$dpkgArch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -60,8 +60,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.15.13.src.tar.gz'; \
-		sha256='99069e7223479cce4553f84f874b9345f6f4045f27cf5089489b546da619a244'; \
+		url='https://dl.google.com/go/go1.17beta1.src.tar.gz'; \
+		sha256='02b8973725f9bc545955865576e8c8f6ca672312f69fd9e5549c25b0ce1d75f0'; \
 		echo >&2; \
 		echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; \
 		echo >&2; \
diff --git a/golang_1.15-nanoserver-1809/Dockerfile b/golang_rc-nanoserver-1809/Dockerfile
similarity index 87%
copy from golang_1.15-nanoserver-1809/Dockerfile
copy to golang_rc-nanoserver-1809/Dockerfile
index 6fe863e..cce6030 100644
--- a/golang_1.15-nanoserver-1809/Dockerfile
+++ b/golang_rc-nanoserver-1809/Dockerfile
@@ -20,9 +20,9 @@ RUN setx /m PATH "%GOPATH%\bin;C:\go\bin;%PATH%"
 USER ContainerUser
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.15.13
+ENV GOLANG_VERSION 1.17beta1
 
-COPY --from=golang:1.15.13-windowsservercore-1809 C:\\go C:\\go
+COPY --from=golang:1.17beta1-windowsservercore-1809 C:\\go C:\\go
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_1.15-stretch/Dockerfile b/golang_rc-stretch/Dockerfile
similarity index 74%
copy from golang_1.15-stretch/Dockerfile
copy to golang_rc-stretch/Dockerfile
index 2ad4644..ebaba38 100644
--- a/golang_1.15-stretch/Dockerfile
+++ b/golang_rc-stretch/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.15.13
+ENV GOLANG_VERSION 1.17beta1
 
 RUN set -eux; \
 	\
@@ -25,34 +25,34 @@ RUN set -eux; \
 	url=; \
 	case "${dpkgArch##*-}" in \
 		'amd64') \
-			url='https://dl.google.com/go/go1.15.13.linux-amd64.tar.gz'; \
-			sha256='3d3beec5fc66659018e09f40abb7274b10794229ba7c1e8bdb7d8ca77b656a13'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-amd64.tar.gz'; \
+			sha256='a479681705b65971f9db079bfce53c4393bfa241d952eb09de88fb40677d3c4c'; \
 			;; \
 		'armel') \
 			export GOARCH='arm' GOARM='5' GOOS='linux'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.15.13.linux-armv6l.tar.gz'; \
-			sha256='00ff453f102c67ff6b790ba0cb10cecf73c8e8bbd9d913e5978ac8cc6323132f'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-armv6l.tar.gz'; \
+			sha256='f4ab69c75a1f9e43b07ca9a0bfdf68ca1e2b0b51d4ebfb8c79f60ed14629f4e6'; \
 			;; \
 		'arm64') \
-			url='https://dl.google.com/go/go1.15.13.linux-arm64.tar.gz'; \
-			sha256='f3989dca4dea5fbadfec253d7c24e4111773b203e677abb1f01e768a99cc14e6'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-arm64.tar.gz'; \
+			sha256='ede56f79c5061146929ab4a128e8ee7bc713d141e87b3df4e0aa670938e128b3'; \
 			;; \
 		'i386') \
-			url='https://dl.google.com/go/go1.15.13.linux-386.tar.gz'; \
-			sha256='8df80ccbbd57b108ec43066925bf02aac47bc9e0236894dbd019f26944d27399'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-386.tar.gz'; \
+			sha256='cebbf75985ba7e6f1a5b137916a6019685d52ecf36c262092ffc3f714cd85974'; \
 			;; \
 		'mips64el') \
 			export GOARCH='mips64le' GOOS='linux'; \
 			;; \
 		'ppc64el') \
-			url='https://dl.google.com/go/go1.15.13.linux-ppc64le.tar.gz'; \
-			sha256='1a27f62d8812c28700e49cae46b9a378410e9eb735c79b1722cbe685f1c72528'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-ppc64le.tar.gz'; \
+			sha256='0a6e5034fcbd4b38642b56841a042135aec1e87f61258d2d70aafc0a667bdd11'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.15.13.linux-s390x.tar.gz'; \
-			sha256='4448244965699706eff54d1f38917b8a896a27cf61a494f514818303c669a4b3'; \
+			url='https://dl.google.com/go/go1.17beta1.linux-s390x.tar.gz'; \
+			sha256='3501d139a9433775001730f1d9c3fb60d7b93b969fe16bd80fc7387a3d5259b1'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$dpkgArch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -60,8 +60,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.15.13.src.tar.gz'; \
-		sha256='99069e7223479cce4553f84f874b9345f6f4045f27cf5089489b546da619a244'; \
+		url='https://dl.google.com/go/go1.17beta1.src.tar.gz'; \
+		sha256='02b8973725f9bc545955865576e8c8f6ca672312f69fd9e5549c25b0ce1d75f0'; \
 		echo >&2; \
 		echo >&2 "warning: current architecture ($dpkgArch) does not have a corresponding Go binary release; will be building from source"; \
 		echo >&2; \
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_rc-windowsservercore-1809/Dockerfile
similarity index 94%
copy from golang_windowsservercore-1809/Dockerfile
copy to golang_rc-windowsservercore-1809/Dockerfile
index 697e451..206a9a5 100644
--- a/golang_windowsservercore-1809/Dockerfile
+++ b/golang_rc-windowsservercore-1809/Dockerfile
@@ -52,13 +52,13 @@ RUN $newPath = ('{0}\bin;C:\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.16.5
+ENV GOLANG_VERSION 1.17beta1
 
-RUN $url = 'https://dl.google.com/go/go1.16.5.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.17beta1.windows-amd64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '0a3fa279ae5b91bc8c88017198c8f1ba5d9925eb6e5d7571316e567c73add39d'; \
+	$sha256 = '7a2154c1a35d3e6441e649c81a30817f8f669aea9029f5d1010e1a264dfd264f'; \
 	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.15-windowsservercore-ltsc2016/Dockerfile b/golang_rc-windowsservercore-ltsc2016/Dockerfile
similarity index 94%
copy from golang_1.15-windowsservercore-ltsc2016/Dockerfile
copy to golang_rc-windowsservercore-ltsc2016/Dockerfile
index 3151f30..57ed966 100644
--- a/golang_1.15-windowsservercore-ltsc2016/Dockerfile
+++ b/golang_rc-windowsservercore-ltsc2016/Dockerfile
@@ -52,13 +52,13 @@ RUN $newPath = ('{0}\bin;C:\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.15.13
+ENV GOLANG_VERSION 1.17beta1
 
-RUN $url = 'https://dl.google.com/go/go1.15.13.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.17beta1.windows-amd64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = 'd1cf76a11bbd5158715a3e3b6b7f0c623f5472f7c0e654c858913b74b09e7e81'; \
+	$sha256 = '7a2154c1a35d3e6441e649c81a30817f8f669aea9029f5d1010e1a264dfd264f'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \

@yosifkit yosifkit merged commit cf75123 into docker-library:master Jun 10, 2021
@yosifkit yosifkit deleted the golang branch June 10, 2021 20:42
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