Update golang #14911
Merged
Update golang #14911
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/golang@72bc141: Update supported architectures - docker-library/golang@e788e6d: Merge pull request docker-library/golang#469 from jnoordsij/add-1.21-rc - docker-library/golang@1ab26fd: Add 1.21-rc variant
Diff for 8e0e6ac:diff --git a/_bashbrew-cat b/_bashbrew-cat
index fa46bb2..e7db6f6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -14,12 +14,12 @@ Directory: 1.19/alpine3.18
Tags: 1.19.10-bookworm, 1.19-bookworm
SharedTags: 1.19.10, 1.19
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: cd607138e461368506a6ba50be2163a09b93dab5
+GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
Directory: 1.19/bookworm
Tags: 1.19.10-bullseye, 1.19-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: e16be5c5a93bd4a2d26ede8cb753ad3578203286
+GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
Directory: 1.19/bullseye
Tags: 1.19.10-nanoserver-1809, 1.19-nanoserver-1809
@@ -63,12 +63,12 @@ Directory: 1.20/alpine3.18
Tags: 1.20.5-bookworm, 1.20-bookworm, 1-bookworm, bookworm
SharedTags: 1.20.5, 1.20, 1, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: cd607138e461368506a6ba50be2163a09b93dab5
+GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
Directory: 1.20/bookworm
Tags: 1.20.5-bullseye, 1.20-bullseye, 1-bullseye, bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 29b2d53bcf3365a9fe72612ae24b884546185be6
+GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
Directory: 1.20/bullseye
Tags: 1.20.5-nanoserver-1809, 1.20-nanoserver-1809, 1-nanoserver-1809, nanoserver-1809
@@ -98,3 +98,52 @@ Architectures: windows-amd64
GitCommit: 29b2d53bcf3365a9fe72612ae24b884546185be6
Directory: 1.20/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
+
+Tags: 1.21rc2-alpine3.17, 1.21-rc-alpine3.17
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+Directory: 1.21-rc/alpine3.17
+
+Tags: 1.21rc2-alpine3.18, 1.21-rc-alpine3.18, 1.21rc2-alpine, 1.21-rc-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+Directory: 1.21-rc/alpine3.18
+
+Tags: 1.21rc2-bookworm, 1.21-rc-bookworm
+SharedTags: 1.21rc2, 1.21-rc
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
+Directory: 1.21-rc/bookworm
+
+Tags: 1.21rc2-bullseye, 1.21-rc-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 72bc141d781ae54ef20f71aa1105449cb6c2edc4
+Directory: 1.21-rc/bullseye
+
+Tags: 1.21rc2-nanoserver-1809, 1.21-rc-nanoserver-1809
+SharedTags: 1.21rc2-nanoserver, 1.21-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+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
+Architectures: windows-amd64
+GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+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
+Architectures: windows-amd64
+GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+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
+Architectures: windows-amd64
+GitCommit: 1ab26fd7f52d0cd35223b82e79774a4a3aa24a1b
+Directory: 1.21-rc/windows/windowsservercore-ltsc2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 675776e..1b65dc9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -58,6 +58,30 @@ golang:1.20.5-nanoserver-ltsc2022
golang:1.20.5-windowsservercore
golang:1.20.5-windowsservercore-1809
golang:1.20.5-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.21-rc
+golang:1.21-rc-alpine
+golang:1.21-rc-alpine3.17
+golang:1.21-rc-alpine3.18
+golang:1.21-rc-bookworm
+golang:1.21-rc-bullseye
+golang:1.21-rc-nanoserver
+golang:1.21-rc-nanoserver-1809
+golang:1.21-rc-nanoserver-ltsc2022
+golang:1.21-rc-windowsservercore
+golang:1.21-rc-windowsservercore-1809
+golang:1.21-rc-windowsservercore-ltsc2022
golang:alpine
golang:alpine3.17
golang:alpine3.18
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 6fc07f2..8867398 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -10,7 +10,15 @@ golang:bookworm
golang:bullseye
golang:windowsservercore-1809
golang:windowsservercore-ltsc2022
+golang:1.21-rc-alpine3.17
+golang:1.21-rc-alpine
+golang:1.21-rc-bookworm
+golang:1.21-rc-bullseye
+golang:1.21-rc-windowsservercore-1809
+golang:1.21-rc-windowsservercore-ltsc2022
golang:1.19-nanoserver-1809
golang:1.19-nanoserver-ltsc2022
golang:nanoserver-1809
golang:nanoserver-ltsc2022
+golang:1.21-rc-nanoserver-1809
+golang:1.21-rc-nanoserver-ltsc2022
diff --git a/golang_1.19-bookworm/Dockerfile b/golang_1.19-bookworm/Dockerfile
index 2dabbe4..e06c7cc 100644
--- a/golang_1.19-bookworm/Dockerfile
+++ b/golang_1.19-bookworm/Dockerfile
@@ -52,6 +52,9 @@ RUN set -eux; \
url='https://dl.google.com/go/go1.19.10.linux-ppc64le.tar.gz'; \
sha256='726256cd435a39aba76e5e8ea7e6e7cc4bca0fbe023d00f11690d7c95a9648dd'; \
;; \
+ 'riscv64') \
+ export GOARCH='riscv64' GOOS='linux'; \
+ ;; \
's390x') \
url='https://dl.google.com/go/go1.19.10.linux-s390x.tar.gz'; \
sha256='3c6598e8a4db1cb87847c4698e5774303a21c8849584419f16d760a8093e0b5e'; \
diff --git a/golang_1.19-bullseye/Dockerfile b/golang_1.19-bullseye/Dockerfile
index f473afa..e8f7a41 100644
--- a/golang_1.19-bullseye/Dockerfile
+++ b/golang_1.19-bullseye/Dockerfile
@@ -52,6 +52,9 @@ RUN set -eux; \
url='https://dl.google.com/go/go1.19.10.linux-ppc64le.tar.gz'; \
sha256='726256cd435a39aba76e5e8ea7e6e7cc4bca0fbe023d00f11690d7c95a9648dd'; \
;; \
+ 'riscv64') \
+ export GOARCH='riscv64' GOOS='linux'; \
+ ;; \
's390x') \
url='https://dl.google.com/go/go1.19.10.linux-s390x.tar.gz'; \
sha256='3c6598e8a4db1cb87847c4698e5774303a21c8849584419f16d760a8093e0b5e'; \
diff --git a/golang_1.19-alpine/Dockerfile b/golang_1.21-rc-alpine/Dockerfile
similarity index 95%
copy from golang_1.19-alpine/Dockerfile
copy to golang_1.21-rc-alpine/Dockerfile
index 3e421fe..6b13e1c 100644
--- a/golang_1.19-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.19.10
+ENV GOLANG_VERSION 1.21rc2
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -44,8 +44,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.19.10.src.tar.gz'; \
- sha256='13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f'; \
+ url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
+ sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
# 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.19-alpine3.17/Dockerfile b/golang_1.21-rc-alpine3.17/Dockerfile
similarity index 95%
copy from golang_1.19-alpine3.17/Dockerfile
copy to golang_1.21-rc-alpine3.17/Dockerfile
index d88fd8d..d3b43d4 100644
--- a/golang_1.19-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.19.10
+ENV GOLANG_VERSION 1.21rc2
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps gnupg; \
@@ -44,8 +44,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.19.10.src.tar.gz'; \
- sha256='13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f'; \
+ url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
+ sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
# 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.19-bookworm/Dockerfile b/golang_1.21-rc-bookworm/Dockerfile
similarity index 69%
copy from golang_1.19-bookworm/Dockerfile
copy to golang_1.21-rc-bookworm/Dockerfile
index 2dabbe4..9ece6f2 100644
--- a/golang_1.19-bookworm/Dockerfile
+++ b/golang_1.21-rc-bookworm/Dockerfile
@@ -20,41 +20,46 @@ RUN set -eux; \
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.19.10
+ENV GOLANG_VERSION 1.21rc2
RUN set -eux; \
arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
url=; \
case "$arch" in \
'amd64') \
- url='https://dl.google.com/go/go1.19.10.linux-amd64.tar.gz'; \
- sha256='8b045a483d3895c6edba2e90a9189262876190dbbd21756870cdd63821810677'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-amd64.tar.gz'; \
+ sha256='8fe90332727c606019e80a7368e23f5e65ad59520e45ee4010692f15572e45c6'; \
;; \
'armel') \
export GOARCH='arm' GOARM='5' GOOS='linux'; \
;; \
'armhf') \
- url='https://dl.google.com/go/go1.19.10.linux-armv6l.tar.gz'; \
- sha256='937f885c35f191be4c6a618868ae0dbbb15b0213925a1a104d122eba02622356'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
+ sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
;; \
'arm64') \
- url='https://dl.google.com/go/go1.19.10.linux-arm64.tar.gz'; \
- sha256='df98698821211c819e8b2420c77a0f802d989e377718578a31b1f91f6be2c5b4'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-arm64.tar.gz'; \
+ sha256='30a6518ca5f816c0fef5b2cc16b960e999b98b16f7d69f995f74236cc00aa292'; \
;; \
'i386') \
- url='https://dl.google.com/go/go1.19.10.linux-386.tar.gz'; \
- sha256='45a34313664d66087d49b46ca63a3ecf292f56e9e63bd439829b5eaf0270586d'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-386.tar.gz'; \
+ sha256='cf330c82e41cf766af5629772600d5ecd3d24faeacdba8ac1f5f33acc6590175'; \
;; \
'mips64el') \
- export GOARCH='mips64le' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-mips64le.tar.gz'; \
+ sha256='918d7a64f8745e4c4674396b2160780c45a3f11b80fffc0cf01638a34b3a003d'; \
;; \
'ppc64el') \
- url='https://dl.google.com/go/go1.19.10.linux-ppc64le.tar.gz'; \
- sha256='726256cd435a39aba76e5e8ea7e6e7cc4bca0fbe023d00f11690d7c95a9648dd'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-ppc64le.tar.gz'; \
+ sha256='8c3a2674cf57c304ed1a8f4e0a6184ad85fd5760a04dea608fdcaca7ad863027'; \
+ ;; \
+ 'riscv64') \
+ url='https://dl.google.com/go/go1.21rc2.linux-riscv64.tar.gz'; \
+ sha256='33ea0c09d1f10f034d9e4fbef4eaceb785f3433ba631eaacb01a0af40773b673'; \
;; \
's390x') \
- url='https://dl.google.com/go/go1.19.10.linux-s390x.tar.gz'; \
- sha256='3c6598e8a4db1cb87847c4698e5774303a21c8849584419f16d760a8093e0b5e'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-s390x.tar.gz'; \
+ sha256='3fd1640c1f4c50dff412643cd61577d53c8241f1f2789605b1ff1048d2b36f95'; \
;; \
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
esac; \
@@ -62,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.19.10.src.tar.gz'; \
- sha256='13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f'; \
+ url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
+ sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
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_bullseye/Dockerfile b/golang_1.21-rc-bullseye/Dockerfile
similarity index 70%
copy from golang_bullseye/Dockerfile
copy to golang_1.21-rc-bullseye/Dockerfile
index 152a789..9d4435c 100644
--- a/golang_bullseye/Dockerfile
+++ b/golang_1.21-rc-bullseye/Dockerfile
@@ -20,41 +20,46 @@ RUN set -eux; \
ENV PATH /usr/local/go/bin:$PATH
-ENV GOLANG_VERSION 1.20.5
+ENV GOLANG_VERSION 1.21rc2
RUN set -eux; \
arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \
url=; \
case "$arch" in \
'amd64') \
- url='https://dl.google.com/go/go1.20.5.linux-amd64.tar.gz'; \
- sha256='d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-amd64.tar.gz'; \
+ sha256='8fe90332727c606019e80a7368e23f5e65ad59520e45ee4010692f15572e45c6'; \
;; \
'armel') \
export GOARCH='arm' GOARM='5' GOOS='linux'; \
;; \
'armhf') \
- url='https://dl.google.com/go/go1.20.5.linux-armv6l.tar.gz'; \
- sha256='79d8210efd4390569912274a98dffc16eb85993cccdeef4d704e9b0dfd50743a'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-armv6l.tar.gz'; \
+ sha256='0f82199e49978db858a8ed2c6b8d842b9674fd577c4ab91cc4b6b11672375993'; \
;; \
'arm64') \
- url='https://dl.google.com/go/go1.20.5.linux-arm64.tar.gz'; \
- sha256='aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-arm64.tar.gz'; \
+ sha256='30a6518ca5f816c0fef5b2cc16b960e999b98b16f7d69f995f74236cc00aa292'; \
;; \
'i386') \
- url='https://dl.google.com/go/go1.20.5.linux-386.tar.gz'; \
- sha256='d394ac8fecf66812c78ffba7fb9a265bb1b9917564c7fd77f0edb0df6d5777a1'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-386.tar.gz'; \
+ sha256='cf330c82e41cf766af5629772600d5ecd3d24faeacdba8ac1f5f33acc6590175'; \
;; \
'mips64el') \
- export GOARCH='mips64le' GOOS='linux'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-mips64le.tar.gz'; \
+ sha256='918d7a64f8745e4c4674396b2160780c45a3f11b80fffc0cf01638a34b3a003d'; \
;; \
'ppc64el') \
- url='https://dl.google.com/go/go1.20.5.linux-ppc64le.tar.gz'; \
- sha256='049b8ab07d34077b90c0642138e10207f6db14bdd1743ea994a21e228f8ca53d'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-ppc64le.tar.gz'; \
+ sha256='8c3a2674cf57c304ed1a8f4e0a6184ad85fd5760a04dea608fdcaca7ad863027'; \
+ ;; \
+ 'riscv64') \
+ url='https://dl.google.com/go/go1.21rc2.linux-riscv64.tar.gz'; \
+ sha256='33ea0c09d1f10f034d9e4fbef4eaceb785f3433ba631eaacb01a0af40773b673'; \
;; \
's390x') \
- url='https://dl.google.com/go/go1.20.5.linux-s390x.tar.gz'; \
- sha256='bac14667f1217ccce1d2ef4e204687fe6191e6dc19a8870cfb81a41f78b04e48'; \
+ url='https://dl.google.com/go/go1.21rc2.linux-s390x.tar.gz'; \
+ sha256='3fd1640c1f4c50dff412643cd61577d53c8241f1f2789605b1ff1048d2b36f95'; \
;; \
*) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \
esac; \
@@ -62,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.20.5.src.tar.gz'; \
- sha256='9a15c133ba2cfafe79652f4815b62e7cfc267f68df1b9454c6ab2a3ca8b96a88'; \
+ url='https://dl.google.com/go/go1.21rc2.src.tar.gz'; \
+ sha256='91596dce22d91f2d7be6d2b49829f39bdd8573e777d95c1b3c6b0d42b613076e'; \
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.19-nanoserver-1809/Dockerfile b/golang_1.21-rc-nanoserver-1809/Dockerfile
similarity index 92%
copy from golang_1.19-nanoserver-1809/Dockerfile
copy to golang_1.21-rc-nanoserver-1809/Dockerfile
index fc779c1..e73add3 100644
--- a/golang_1.19-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.19.10
+ENV GOLANG_VERSION 1.21rc2
# Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.19.10-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.21rc2-windowsservercore-1809 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
RUN go version
WORKDIR $GOPATH
diff --git a/golang_1.19-nanoserver-ltsc2022/Dockerfile b/golang_1.21-rc-nanoserver-ltsc2022/Dockerfile
similarity index 92%
copy from golang_1.19-nanoserver-ltsc2022/Dockerfile
copy to golang_1.21-rc-nanoserver-ltsc2022/Dockerfile
index 0292356..781499c 100644
--- a/golang_1.19-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.19.10
+ENV GOLANG_VERSION 1.21rc2
# Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.19.10-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.21rc2-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
RUN go version
WORKDIR $GOPATH
diff --git a/golang_1.19-windowsservercore-1809/Dockerfile b/golang_1.21-rc-windowsservercore-1809/Dockerfile
similarity index 95%
copy from golang_1.19-windowsservercore-1809/Dockerfile
copy to golang_1.21-rc-windowsservercore-1809/Dockerfile
index bd43a76..03f8fac 100644
--- a/golang_1.19-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.19.10
+ENV GOLANG_VERSION 1.21rc2
-RUN $url = 'https://dl.google.com/go/go1.19.10.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.21rc2.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = 'c749a054a5da17202113455040484893c29ebe5ab71fa89f60cdfb4561dcce8c'; \
+ $sha256 = '766aab8c782b8ee833dbc81ed53ef1c23668dee0f955c32d85f66fda2ecadadf'; \
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.19-windowsservercore-ltsc2022/Dockerfile b/golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile
similarity index 95%
copy from golang_1.19-windowsservercore-ltsc2022/Dockerfile
copy to golang_1.21-rc-windowsservercore-ltsc2022/Dockerfile
index ca5f821..4cddd82 100644
--- a/golang_1.19-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.19.10
+ENV GOLANG_VERSION 1.21rc2
-RUN $url = 'https://dl.google.com/go/go1.19.10.windows-amd64.zip'; \
+RUN $url = 'https://dl.google.com/go/go1.21rc2.windows-amd64.zip'; \
Write-Host ('Downloading {0} ...' -f $url); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
- $sha256 = 'c749a054a5da17202113455040484893c29ebe5ab71fa89f60cdfb4561dcce8c'; \
+ $sha256 = '766aab8c782b8ee833dbc81ed53ef1c23668dee0f955c32d85f66fda2ecadadf'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \
diff --git a/golang_bookworm/Dockerfile b/golang_bookworm/Dockerfile
index b35d405..f4d04bd 100644
--- a/golang_bookworm/Dockerfile
+++ b/golang_bookworm/Dockerfile
@@ -52,6 +52,9 @@ RUN set -eux; \
url='https://dl.google.com/go/go1.20.5.linux-ppc64le.tar.gz'; \
sha256='049b8ab07d34077b90c0642138e10207f6db14bdd1743ea994a21e228f8ca53d'; \
;; \
+ 'riscv64') \
+ export GOARCH='riscv64' GOOS='linux'; \
+ ;; \
's390x') \
url='https://dl.google.com/go/go1.20.5.linux-s390x.tar.gz'; \
sha256='bac14667f1217ccce1d2ef4e204687fe6191e6dc19a8870cfb81a41f78b04e48'; \
diff --git a/golang_bullseye/Dockerfile b/golang_bullseye/Dockerfile
index 152a789..9ff5bc2 100644
--- a/golang_bullseye/Dockerfile
+++ b/golang_bullseye/Dockerfile
@@ -52,6 +52,9 @@ RUN set -eux; \
url='https://dl.google.com/go/go1.20.5.linux-ppc64le.tar.gz'; \
sha256='049b8ab07d34077b90c0642138e10207f6db14bdd1743ea994a21e228f8ca53d'; \
;; \
+ 'riscv64') \
+ export GOARCH='riscv64' GOOS='linux'; \
+ ;; \
's390x') \
url='https://dl.google.com/go/go1.20.5.linux-s390x.tar.gz'; \
sha256='bac14667f1217ccce1d2ef4e204687fe6191e6dc19a8870cfb81a41f78b04e48'; \Relevant Maintainers: |
|
(don't get excited about those |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: