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

Merged
merged 1 commit into from
Mar 16, 2022
Merged

Update golang #12045

merged 1 commit into from
Mar 16, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Mar 15, 2022

Changes:

Changes:

- docker-library/golang@64de1d3: Merge pull request docker-library/golang#411 from infosiftr/1.18
- docker-library/golang@e4e2e5e: Update to 1.18 GA (drop 1.16)
@github-actions
Copy link

Diff for 9075637:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b9f4df9..fe16992 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,60 +1,6 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit), Johan Euphrosine <[email protected]> (@proppy)
 GitRepo: https://github.com/docker-library/golang.git
 
-Tags: 1.16.15-alpine3.14, 1.16-alpine3.14
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/alpine3.14
-
-Tags: 1.16.15-alpine3.15, 1.16-alpine3.15, 1.16.15-alpine, 1.16-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/alpine3.15
-
-Tags: 1.16.15-bullseye, 1.16-bullseye
-SharedTags: 1.16.15, 1.16
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/bullseye
-
-Tags: 1.16.15-buster, 1.16-buster
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/buster
-
-Tags: 1.16.15-nanoserver-1809, 1.16-nanoserver-1809
-SharedTags: 1.16.15-nanoserver, 1.16-nanoserver
-Architectures: windows-amd64
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/windows/nanoserver-1809
-Constraints: nanoserver-1809, windowsservercore-1809
-
-Tags: 1.16.15-nanoserver-ltsc2022, 1.16-nanoserver-ltsc2022
-SharedTags: 1.16.15-nanoserver, 1.16-nanoserver
-Architectures: windows-amd64
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/windows/nanoserver-ltsc2022
-Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
-
-Tags: 1.16.15-stretch, 1.16-stretch
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/stretch
-
-Tags: 1.16.15-windowsservercore-1809, 1.16-windowsservercore-1809
-SharedTags: 1.16.15-windowsservercore, 1.16-windowsservercore, 1.16.15, 1.16
-Architectures: windows-amd64
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/windows/windowsservercore-1809
-Constraints: windowsservercore-1809
-
-Tags: 1.16.15-windowsservercore-ltsc2022, 1.16-windowsservercore-ltsc2022
-SharedTags: 1.16.15-windowsservercore, 1.16-windowsservercore, 1.16.15, 1.16
-Architectures: windows-amd64
-GitCommit: ceac6589f926d83c96ce7ccb1574b4b735feac3c
-Directory: 1.16/windows/windowsservercore-ltsc2022
-Constraints: windowsservercore-ltsc2022
-
 Tags: 1.17.8-alpine3.14, 1.17-alpine3.14, 1-alpine3.14, alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: 67757c0feeb9867a54801ca378dcfc55b9db7e70
@@ -109,56 +55,56 @@ GitCommit: 67757c0feeb9867a54801ca378dcfc55b9db7e70
 Directory: 1.17/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 1.18rc1-alpine3.14, 1.18-rc-alpine3.14, rc-alpine3.14
+Tags: 1.18.0-alpine3.14, 1.18-alpine3.14
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/alpine3.14
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/alpine3.14
 
-Tags: 1.18rc1-alpine3.15, 1.18-rc-alpine3.15, rc-alpine3.15, 1.18rc1-alpine, 1.18-rc-alpine, rc-alpine
+Tags: 1.18.0-alpine3.15, 1.18-alpine3.15, 1.18.0-alpine, 1.18-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/alpine3.15
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/alpine3.15
 
-Tags: 1.18rc1-bullseye, 1.18-rc-bullseye, rc-bullseye
-SharedTags: 1.18rc1, 1.18-rc, rc
+Tags: 1.18.0-bullseye, 1.18-bullseye
+SharedTags: 1.18.0, 1.18
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/bullseye
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/bullseye
 
-Tags: 1.18rc1-buster, 1.18-rc-buster, rc-buster
+Tags: 1.18.0-buster, 1.18-buster
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/buster
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/buster
 
-Tags: 1.18rc1-nanoserver-1809, 1.18-rc-nanoserver-1809, rc-nanoserver-1809
-SharedTags: 1.18rc1-nanoserver, 1.18-rc-nanoserver, rc-nanoserver
+Tags: 1.18.0-nanoserver-1809, 1.18-nanoserver-1809
+SharedTags: 1.18.0-nanoserver, 1.18-nanoserver
 Architectures: windows-amd64
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/windows/nanoserver-1809
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/windows/nanoserver-1809
 Constraints: nanoserver-1809, windowsservercore-1809
 
-Tags: 1.18rc1-nanoserver-ltsc2022, 1.18-rc-nanoserver-ltsc2022, rc-nanoserver-ltsc2022
-SharedTags: 1.18rc1-nanoserver, 1.18-rc-nanoserver, rc-nanoserver
+Tags: 1.18.0-nanoserver-ltsc2022, 1.18-nanoserver-ltsc2022
+SharedTags: 1.18.0-nanoserver, 1.18-nanoserver
 Architectures: windows-amd64
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/windows/nanoserver-ltsc2022
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/windows/nanoserver-ltsc2022
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
-Tags: 1.18rc1-stretch, 1.18-rc-stretch, rc-stretch
+Tags: 1.18.0-stretch, 1.18-stretch
 Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/stretch
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/stretch
 
-Tags: 1.18rc1-windowsservercore-1809, 1.18-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 1.18rc1-windowsservercore, 1.18-rc-windowsservercore, rc-windowsservercore, 1.18rc1, 1.18-rc, rc
+Tags: 1.18.0-windowsservercore-1809, 1.18-windowsservercore-1809
+SharedTags: 1.18.0-windowsservercore, 1.18-windowsservercore, 1.18.0, 1.18
 Architectures: windows-amd64
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/windows/windowsservercore-1809
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 1.18rc1-windowsservercore-ltsc2022, 1.18-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 1.18rc1-windowsservercore, 1.18-rc-windowsservercore, rc-windowsservercore, 1.18rc1, 1.18-rc, rc
+Tags: 1.18.0-windowsservercore-ltsc2022, 1.18-windowsservercore-ltsc2022
+SharedTags: 1.18.0-windowsservercore, 1.18-windowsservercore, 1.18.0, 1.18
 Architectures: windows-amd64
-GitCommit: 7db3fb743f7d5d24d75493eacfc0595ce97979da
-Directory: 1.18-rc/windows/windowsservercore-ltsc2022
+GitCommit: e4e2e5e3b96141bf31de0f011c676406e8ef0f66
+Directory: 1.18/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 8788b0e..7f2c8dd 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -11,32 +11,6 @@ golang:1-stretch
 golang:1-windowsservercore
 golang:1-windowsservercore-1809
 golang:1-windowsservercore-ltsc2022
-golang:1.16
-golang:1.16-alpine
-golang:1.16-alpine3.14
-golang:1.16-alpine3.15
-golang:1.16-bullseye
-golang:1.16-buster
-golang:1.16-nanoserver
-golang:1.16-nanoserver-1809
-golang:1.16-nanoserver-ltsc2022
-golang:1.16-stretch
-golang:1.16-windowsservercore
-golang:1.16-windowsservercore-1809
-golang:1.16-windowsservercore-ltsc2022
-golang:1.16.15
-golang:1.16.15-alpine
-golang:1.16.15-alpine3.14
-golang:1.16.15-alpine3.15
-golang:1.16.15-bullseye
-golang:1.16.15-buster
-golang:1.16.15-nanoserver
-golang:1.16.15-nanoserver-1809
-golang:1.16.15-nanoserver-ltsc2022
-golang:1.16.15-stretch
-golang:1.16.15-windowsservercore
-golang:1.16.15-windowsservercore-1809
-golang:1.16.15-windowsservercore-ltsc2022
 golang:1.17
 golang:1.17-alpine
 golang:1.17-alpine3.14
@@ -63,32 +37,32 @@ golang:1.17.8-stretch
 golang:1.17.8-windowsservercore
 golang:1.17.8-windowsservercore-1809
 golang:1.17.8-windowsservercore-ltsc2022
-golang:1.18rc1
-golang:1.18rc1-alpine
-golang:1.18rc1-alpine3.14
-golang:1.18rc1-alpine3.15
-golang:1.18rc1-bullseye
-golang:1.18rc1-buster
-golang:1.18rc1-nanoserver
-golang:1.18rc1-nanoserver-1809
-golang:1.18rc1-nanoserver-ltsc2022
-golang:1.18rc1-stretch
-golang:1.18rc1-windowsservercore
-golang:1.18rc1-windowsservercore-1809
-golang:1.18rc1-windowsservercore-ltsc2022
-golang:1.18-rc
-golang:1.18-rc-alpine
-golang:1.18-rc-alpine3.14
-golang:1.18-rc-alpine3.15
-golang:1.18-rc-bullseye
-golang:1.18-rc-buster
-golang:1.18-rc-nanoserver
-golang:1.18-rc-nanoserver-1809
-golang:1.18-rc-nanoserver-ltsc2022
-golang:1.18-rc-stretch
-golang:1.18-rc-windowsservercore
-golang:1.18-rc-windowsservercore-1809
-golang:1.18-rc-windowsservercore-ltsc2022
+golang:1.18
+golang:1.18-alpine
+golang:1.18-alpine3.14
+golang:1.18-alpine3.15
+golang:1.18-bullseye
+golang:1.18-buster
+golang:1.18-nanoserver
+golang:1.18-nanoserver-1809
+golang:1.18-nanoserver-ltsc2022
+golang:1.18-stretch
+golang:1.18-windowsservercore
+golang:1.18-windowsservercore-1809
+golang:1.18-windowsservercore-ltsc2022
+golang:1.18.0
+golang:1.18.0-alpine
+golang:1.18.0-alpine3.14
+golang:1.18.0-alpine3.15
+golang:1.18.0-bullseye
+golang:1.18.0-buster
+golang:1.18.0-nanoserver
+golang:1.18.0-nanoserver-1809
+golang:1.18.0-nanoserver-ltsc2022
+golang:1.18.0-stretch
+golang:1.18.0-windowsservercore
+golang:1.18.0-windowsservercore-1809
+golang:1.18.0-windowsservercore-ltsc2022
 golang:alpine
 golang:alpine3.14
 golang:alpine3.15
@@ -98,19 +72,6 @@ golang:latest
 golang:nanoserver
 golang:nanoserver-1809
 golang:nanoserver-ltsc2022
-golang:rc
-golang:rc-alpine
-golang:rc-alpine3.14
-golang:rc-alpine3.15
-golang:rc-bullseye
-golang:rc-buster
-golang:rc-nanoserver
-golang:rc-nanoserver-1809
-golang:rc-nanoserver-ltsc2022
-golang:rc-stretch
-golang:rc-windowsservercore
-golang:rc-windowsservercore-1809
-golang:rc-windowsservercore-ltsc2022
 golang:stretch
 golang:windowsservercore
 golang:windowsservercore-1809
diff --git a/golang_1.16-alpine/Dockerfile b/golang_1.16-alpine/Dockerfile
deleted file mode 100644
index 967fd59..0000000
diff --git a/golang_1.16-bullseye/Dockerfile b/golang_1.16-bullseye/Dockerfile
deleted file mode 100644
index 13151b0..0000000
diff --git a/golang_1.16-nanoserver-1809/Dockerfile b/golang_1.16-nanoserver-1809/Dockerfile
deleted file mode 100644
index a858c96..0000000
diff --git a/golang_1.16-nanoserver-ltsc2022/Dockerfile b/golang_1.16-nanoserver-ltsc2022/Dockerfile
deleted file mode 100644
index c8afef5..0000000
diff --git a/golang_1.16-stretch/Dockerfile b/golang_1.16-stretch/Dockerfile
deleted file mode 100644
index 4de951d..0000000
diff --git a/golang_1.16-windowsservercore-1809/Dockerfile b/golang_1.16-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 7664528..0000000
diff --git a/golang_1.16-windowsservercore-ltsc2022/Dockerfile b/golang_1.16-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 57d02fb..0000000
diff --git a/golang_rc-alpine/Dockerfile b/golang_1.18-alpine/Dockerfile
similarity index 95%
rename from golang_rc-alpine/Dockerfile
rename to golang_1.18-alpine/Dockerfile
index 5e7b193..3e98d61 100644
--- a/golang_rc-alpine/Dockerfile
+++ b/golang_1.18-alpine/Dockerfile
@@ -15,7 +15,7 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.18rc1
+ENV GOLANG_VERSION 1.18
 
 RUN set -eux; \
 	apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -49,8 +49,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.18rc1.src.tar.gz'; \
-		sha256='5cec7a6653008fa85f8821b33665de37be289b7a02f17f36f705a88c43980bb8'; \
+		url='https://dl.google.com/go/go1.18.src.tar.gz'; \
+		sha256='38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6'; \
 # the precompiled binaries published by Go upstream are not compatible with Alpine, so we always build from source here 😅
 	fi; \
 	\
diff --git a/golang_1.16-alpine3.14/Dockerfile b/golang_1.18-alpine3.14/Dockerfile
similarity index 95%
rename from golang_1.16-alpine3.14/Dockerfile
rename to golang_1.18-alpine3.14/Dockerfile
index 36a3d5c..5537ac9 100644
--- a/golang_1.16-alpine3.14/Dockerfile
+++ b/golang_1.18-alpine3.14/Dockerfile
@@ -15,7 +15,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.15
+ENV GOLANG_VERSION 1.18
 
 RUN set -eux; \
 	apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -49,8 +49,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.16.15.src.tar.gz'; \
-		sha256='90a08c689279e35f3865ba510998c33a63255c36089b3ec206c912fc0568c3d3'; \
+		url='https://dl.google.com/go/go1.18.src.tar.gz'; \
+		sha256='38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6'; \
 # the precompiled binaries published by Go upstream are not compatible with Alpine, so we always build from source here 😅
 	fi; \
 	\
diff --git a/golang_rc-bullseye/Dockerfile b/golang_1.18-bullseye/Dockerfile
similarity index 74%
rename from golang_rc-bullseye/Dockerfile
rename to golang_1.18-bullseye/Dockerfile
index 269a2fd..c65bcd2 100644
--- a/golang_rc-bullseye/Dockerfile
+++ b/golang_1.18-bullseye/Dockerfile
@@ -20,41 +20,41 @@ RUN set -eux; \
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.18rc1
+ENV GOLANG_VERSION 1.18
 
 RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
 	url=; \
 	case "$arch" in \
 		'amd64') \
-			url='https://dl.google.com/go/go1.18rc1.linux-amd64.tar.gz'; \
-			sha256='9ea4e6adee711e06fa95546e1a9629b63de3aaae85fac9dc752fb533f3e5be23'; \
+			url='https://dl.google.com/go/go1.18.linux-amd64.tar.gz'; \
+			sha256='e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f'; \
 			;; \
 		'armel') \
 			export GOARCH='arm' GOARM='5' GOOS='linux'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.18rc1.linux-armv6l.tar.gz'; \
-			sha256='d7a3f97b23b1e1f2e1a3596ff011e78f93aa8bbd991e2065ac34c18993884ea1'; \
+			url='https://dl.google.com/go/go1.18.linux-armv6l.tar.gz'; \
+			sha256='a80fa43d1f4575fb030adbfbaa94acd860c6847820764eecb06c63b7c103612b'; \
 			;; \
 		'arm64') \
-			url='https://dl.google.com/go/go1.18rc1.linux-arm64.tar.gz'; \
-			sha256='e4528a113016872a3715cec37a6c6dad36d76d51a50fa19b33b7673e47e6df44'; \
+			url='https://dl.google.com/go/go1.18.linux-arm64.tar.gz'; \
+			sha256='7ac7b396a691e588c5fb57687759e6c4db84a2a3bbebb0765f4b38e5b1c5b00e'; \
 			;; \
 		'i386') \
-			url='https://dl.google.com/go/go1.18rc1.linux-386.tar.gz'; \
-			sha256='a4bb0097276fa3523f1ce84dc4ee50fab0b3b0f7fbe72833710434889516c51e'; \
+			url='https://dl.google.com/go/go1.18.linux-386.tar.gz'; \
+			sha256='1c04cf4440b323a66328e0df95d409f955b9b475e58eae235fdd3d1f1cf02f4f'; \
 			;; \
 		'mips64el') \
 			export GOARCH='mips64le' GOOS='linux'; \
 			;; \
 		'ppc64el') \
-			url='https://dl.google.com/go/go1.18rc1.linux-ppc64le.tar.gz'; \
-			sha256='a2944dfc3ee22efe1b940f122ee36cb4bb446e209116e5e8f244e78682ece981'; \
+			url='https://dl.google.com/go/go1.18.linux-ppc64le.tar.gz'; \
+			sha256='070351edac192483c074b38d08ec19251a83f8210765a532a84c3dcf8aec04d8'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.18rc1.linux-s390x.tar.gz'; \
-			sha256='e5578b8cbcc90659496f3930c61c6974c039d32d0573a6726c5d8e62f7e42d68'; \
+			url='https://dl.google.com/go/go1.18.linux-s390x.tar.gz'; \
+			sha256='ea265f5e62fcaf941d53f0cdb81222d9668e1672a0d39d992f16ff0e87c0ee6b'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -62,8 +62,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.18rc1.src.tar.gz'; \
-		sha256='5cec7a6653008fa85f8821b33665de37be289b7a02f17f36f705a88c43980bb8'; \
+		url='https://dl.google.com/go/go1.18.src.tar.gz'; \
+		sha256='38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6'; \
 		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.16-buster/Dockerfile b/golang_1.18-buster/Dockerfile
similarity index 74%
rename from golang_1.16-buster/Dockerfile
rename to golang_1.18-buster/Dockerfile
index 9ab9286..40a68f5 100644
--- a/golang_1.16-buster/Dockerfile
+++ b/golang_1.18-buster/Dockerfile
@@ -20,41 +20,41 @@ RUN set -eux; \
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.16.15
+ENV GOLANG_VERSION 1.18
 
 RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
 	url=; \
 	case "$arch" in \
 		'amd64') \
-			url='https://dl.google.com/go/go1.16.15.linux-amd64.tar.gz'; \
-			sha256='77c782a633186d78c384f972fb113a43c24be0234c42fef22c2d8c4c4c8e7475'; \
+			url='https://dl.google.com/go/go1.18.linux-amd64.tar.gz'; \
+			sha256='e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f'; \
 			;; \
 		'armel') \
 			export GOARCH='arm' GOARM='5' GOOS='linux'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.16.15.linux-armv6l.tar.gz'; \
-			sha256='77d22e294ca4d0f1c4e65d7705902d73ec376e96da473023002333e087ab3106'; \
+			url='https://dl.google.com/go/go1.18.linux-armv6l.tar.gz'; \
+			sha256='a80fa43d1f4575fb030adbfbaa94acd860c6847820764eecb06c63b7c103612b'; \
 			;; \
 		'arm64') \
-			url='https://dl.google.com/go/go1.16.15.linux-arm64.tar.gz'; \
-			sha256='c2f27f0ce5620a9bc2ff3446165d1974ef94e9b885ec12dbfa3c07e0e198b7ce'; \
+			url='https://dl.google.com/go/go1.18.linux-arm64.tar.gz'; \
+			sha256='7ac7b396a691e588c5fb57687759e6c4db84a2a3bbebb0765f4b38e5b1c5b00e'; \
 			;; \
 		'i386') \
-			url='https://dl.google.com/go/go1.16.15.linux-386.tar.gz'; \
-			sha256='81bbff5e671de7e92fc899c7595b5ece4c4e5afa367e613a2aa40c40a0ce8bf1'; \
+			url='https://dl.google.com/go/go1.18.linux-386.tar.gz'; \
+			sha256='1c04cf4440b323a66328e0df95d409f955b9b475e58eae235fdd3d1f1cf02f4f'; \
 			;; \
 		'mips64el') \
 			export GOARCH='mips64le' GOOS='linux'; \
 			;; \
 		'ppc64el') \
-			url='https://dl.google.com/go/go1.16.15.linux-ppc64le.tar.gz'; \
-			sha256='f01ce3d9f007dbc0212db477901402a1c313b00c47d07b55ec3ecf780f039a05'; \
+			url='https://dl.google.com/go/go1.18.linux-ppc64le.tar.gz'; \
+			sha256='070351edac192483c074b38d08ec19251a83f8210765a532a84c3dcf8aec04d8'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.16.15.linux-s390x.tar.gz'; \
-			sha256='bec2755dabc46b105d9eab9da7fc61ebd84eb0bd0bb715559dd5930b5a9ebf1a'; \
+			url='https://dl.google.com/go/go1.18.linux-s390x.tar.gz'; \
+			sha256='ea265f5e62fcaf941d53f0cdb81222d9668e1672a0d39d992f16ff0e87c0ee6b'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -62,8 +62,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.16.15.src.tar.gz'; \
-		sha256='90a08c689279e35f3865ba510998c33a63255c36089b3ec206c912fc0568c3d3'; \
+		url='https://dl.google.com/go/go1.18.src.tar.gz'; \
+		sha256='38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6'; \
 		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_rc-nanoserver-1809/Dockerfile b/golang_1.18-nanoserver-1809/Dockerfile
similarity index 88%
rename from golang_rc-nanoserver-1809/Dockerfile
rename to golang_1.18-nanoserver-1809/Dockerfile
index a20339b..7fc8432 100644
--- a/golang_rc-nanoserver-1809/Dockerfile
+++ b/golang_1.18-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.18rc1
+ENV GOLANG_VERSION 1.18
 
 # Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.18rc1-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.18-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_rc-nanoserver-ltsc2022/Dockerfile b/golang_1.18-nanoserver-ltsc2022/Dockerfile
similarity index 88%
rename from golang_rc-nanoserver-ltsc2022/Dockerfile
rename to golang_1.18-nanoserver-ltsc2022/Dockerfile
index 1189493..e9b5d15 100644
--- a/golang_rc-nanoserver-ltsc2022/Dockerfile
+++ b/golang_1.18-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.18rc1
+ENV GOLANG_VERSION 1.18
 
 # Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.18rc1-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.18-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_rc-stretch/Dockerfile b/golang_1.18-stretch/Dockerfile
similarity index 74%
rename from golang_rc-stretch/Dockerfile
rename to golang_1.18-stretch/Dockerfile
index b9f2996..6e80e3f 100644
--- a/golang_rc-stretch/Dockerfile
+++ b/golang_1.18-stretch/Dockerfile
@@ -20,41 +20,41 @@ RUN set -eux; \
 
 ENV PATH /usr/local/go/bin:$PATH
 
-ENV GOLANG_VERSION 1.18rc1
+ENV GOLANG_VERSION 1.18
 
 RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
 	url=; \
 	case "$arch" in \
 		'amd64') \
-			url='https://dl.google.com/go/go1.18rc1.linux-amd64.tar.gz'; \
-			sha256='9ea4e6adee711e06fa95546e1a9629b63de3aaae85fac9dc752fb533f3e5be23'; \
+			url='https://dl.google.com/go/go1.18.linux-amd64.tar.gz'; \
+			sha256='e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f'; \
 			;; \
 		'armel') \
 			export GOARCH='arm' GOARM='5' GOOS='linux'; \
 			;; \
 		'armhf') \
-			url='https://dl.google.com/go/go1.18rc1.linux-armv6l.tar.gz'; \
-			sha256='d7a3f97b23b1e1f2e1a3596ff011e78f93aa8bbd991e2065ac34c18993884ea1'; \
+			url='https://dl.google.com/go/go1.18.linux-armv6l.tar.gz'; \
+			sha256='a80fa43d1f4575fb030adbfbaa94acd860c6847820764eecb06c63b7c103612b'; \
 			;; \
 		'arm64') \
-			url='https://dl.google.com/go/go1.18rc1.linux-arm64.tar.gz'; \
-			sha256='e4528a113016872a3715cec37a6c6dad36d76d51a50fa19b33b7673e47e6df44'; \
+			url='https://dl.google.com/go/go1.18.linux-arm64.tar.gz'; \
+			sha256='7ac7b396a691e588c5fb57687759e6c4db84a2a3bbebb0765f4b38e5b1c5b00e'; \
 			;; \
 		'i386') \
-			url='https://dl.google.com/go/go1.18rc1.linux-386.tar.gz'; \
-			sha256='a4bb0097276fa3523f1ce84dc4ee50fab0b3b0f7fbe72833710434889516c51e'; \
+			url='https://dl.google.com/go/go1.18.linux-386.tar.gz'; \
+			sha256='1c04cf4440b323a66328e0df95d409f955b9b475e58eae235fdd3d1f1cf02f4f'; \
 			;; \
 		'mips64el') \
 			export GOARCH='mips64le' GOOS='linux'; \
 			;; \
 		'ppc64el') \
-			url='https://dl.google.com/go/go1.18rc1.linux-ppc64le.tar.gz'; \
-			sha256='a2944dfc3ee22efe1b940f122ee36cb4bb446e209116e5e8f244e78682ece981'; \
+			url='https://dl.google.com/go/go1.18.linux-ppc64le.tar.gz'; \
+			sha256='070351edac192483c074b38d08ec19251a83f8210765a532a84c3dcf8aec04d8'; \
 			;; \
 		's390x') \
-			url='https://dl.google.com/go/go1.18rc1.linux-s390x.tar.gz'; \
-			sha256='e5578b8cbcc90659496f3930c61c6974c039d32d0573a6726c5d8e62f7e42d68'; \
+			url='https://dl.google.com/go/go1.18.linux-s390x.tar.gz'; \
+			sha256='ea265f5e62fcaf941d53f0cdb81222d9668e1672a0d39d992f16ff0e87c0ee6b'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
 	esac; \
@@ -62,8 +62,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.18rc1.src.tar.gz'; \
-		sha256='5cec7a6653008fa85f8821b33665de37be289b7a02f17f36f705a88c43980bb8'; \
+		url='https://dl.google.com/go/go1.18.src.tar.gz'; \
+		sha256='38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6'; \
 		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_rc-windowsservercore-1809/Dockerfile b/golang_1.18-windowsservercore-1809/Dockerfile
similarity index 95%
rename from golang_rc-windowsservercore-1809/Dockerfile
rename to golang_1.18-windowsservercore-1809/Dockerfile
index bbb25cc..98de4d5 100644
--- a/golang_rc-windowsservercore-1809/Dockerfile
+++ b/golang_1.18-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.18rc1
+ENV GOLANG_VERSION 1.18
 
-RUN $url = 'https://dl.google.com/go/go1.18rc1.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.18.windows-amd64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '9fd911fcb429b189b8dc1039d48e3c36eaa7ea4b18fa6ca941d3043ab49df0e9'; \
+	$sha256 = '65c5c0c709a7ca1b357091b10b795b439d8b50e579d3893edab4c7e9b384f435'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/golang_rc-windowsservercore-ltsc2022/Dockerfile b/golang_1.18-windowsservercore-ltsc2022/Dockerfile
similarity index 95%
rename from golang_rc-windowsservercore-ltsc2022/Dockerfile
rename to golang_1.18-windowsservercore-ltsc2022/Dockerfile
index c1e6f4d..075950c 100644
--- a/golang_rc-windowsservercore-ltsc2022/Dockerfile
+++ b/golang_1.18-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.18rc1
+ENV GOLANG_VERSION 1.18
 
-RUN $url = 'https://dl.google.com/go/go1.18rc1.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.18.windows-amd64.zip'; \
 	Write-Host ('Downloading {0} ...' -f $url); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
 	Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
 	\
-	$sha256 = '9fd911fcb429b189b8dc1039d48e3c36eaa7ea4b18fa6ca941d3043ab49df0e9'; \
+	$sha256 = '65c5c0c709a7ca1b357091b10b795b439d8b50e579d3893edab4c7e9b384f435'; \
 	Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
 	if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
 		Write-Host 'FAILED!'; \
diff --git a/golang_rc-alpine3.14/Dockerfile b/golang_rc-alpine3.14/Dockerfile
deleted file mode 100644
index 327a0d5..0000000
diff --git a/golang_rc-buster/Dockerfile b/golang_rc-buster/Dockerfile
deleted file mode 100644
index da2c39b..0000000

Relevant Maintainers:

@jauderho
Copy link

linux/ppc64le was an available option in 1.17-alpine images but it appears to be be missing in 1.18-alpine. Was this an oversight or did ppc64le support get deprecated?

Compare:

@DasSkelett
Copy link

DasSkelett commented Mar 16, 2022

Does not look like an oversight, but the ppc64le builds are failing for Alpine (for Debian they are available):
https://doi-janky.infosiftr.net/job/multiarch/view/images/view/golang/job/ppc64le/job/golang/
-> https://doi-janky.infosiftr.net/job/multiarch/view/images/view/golang/job/ppc64le/job/golang/587/console

+ cd /usr/local/go/src
+ go env GOROOT
+ export 'GOROOT_BOOTSTRAP=/usr/lib/go' 'GOHOSTOS=linux' 'GOHOSTARCH=ppc64le'
+ ./make.bash
Building Go cmd/dist using /usr/lib/go. (go1.17.4 linux/ppc64le)
Building Go toolchain1 using /usr/lib/go.
Building Go bootstrap cmd/go (go_bootstrap) using Go toolchain1.
Building Go toolchain2 using go_bootstrap and Go toolchain1.
Building Go toolchain3 using go_bootstrap and Go toolchain2.
Building packages and commands for linux/ppc64le.
go tool dist: FAILED: /usr/local/go/bin/go list -gcflags=all= -ldflags=all= -f={{if .Stale}}	STALE {{.ImportPath}}: {{.StaleReason}}{{end}} std cmd: signal: segmentation fault (core dumped)

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

4 participants