Update architectures lists with more references

This adds riscv64 to our `case` statement so that we're _ready_ for base image support, but it unfortunately does not update our base image to one that supports `riscv64` yet (because that's still Debian Unstable / Alpine Edge only).
docker-library · Jul 13, 2023 · 431c08f · 431c08f
1 parent 5eca4a0
commit 431c08f
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 1 deletion.
diff --git a/1.19/alpine3.17/Dockerfile b/1.19/alpine3.17/Dockerfile
diff --git a/1.19/alpine3.18/Dockerfile b/1.19/alpine3.18/Dockerfile
diff --git a/1.20/alpine3.17/Dockerfile b/1.20/alpine3.17/Dockerfile
diff --git a/1.20/alpine3.18/Dockerfile b/1.20/alpine3.18/Dockerfile
diff --git a/1.21-rc/alpine3.17/Dockerfile b/1.21-rc/alpine3.17/Dockerfile
diff --git a/1.21-rc/alpine3.18/Dockerfile b/1.21-rc/alpine3.18/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -37,16 +37,24 @@ ENV GOLANG_VERSION {{ .version }}
 	def os_arches:
 		if is_alpine then
 			{
+				# https://dl-cdn.alpinelinux.org/alpine/edge/main/
+				# https://dl-cdn.alpinelinux.org/alpine/latest-stable/main/
 				amd64: "x86_64",
 				arm32v6: "armhf",
 				arm32v7: "armv7",
 				arm64v8: "aarch64",
 				i386: "x86",
 				ppc64le: "ppc64le",
+				riscv64: "riscv64",
 				s390x: "s390x",
 			}
 		else
 			{
+				# https://salsa.debian.org/dpkg-team/dpkg/-/blob/main/data/cputable
+				# https://wiki.debian.org/ArchitectureSpecificsMemo#Architecture_baselines
+				# http://deb.debian.org/debian/dists/unstable/main/
+				# http://deb.debian.org/debian/dists/stable/main/
+				# https://deb.debian.org/debian-ports/dists/unstable/main/
 				amd64: "amd64",
 				arm32v5: "armel",
 				arm32v7: "armhf",

diff --git a/versions.sh b/versions.sh
@@ -58,7 +58,7 @@ goVersions="$(
 								.arch
 								| sub("^386$"; "i386")
 								| sub("^arm64$"; "arm64v8")
-								| sub("^armv(?<v>[0-9]+)l?$"; "arm32v\(.v)")
+								| sub("^arm-?v?(?<v>[0-9]+)l?$"; "arm32v\(.v)")
 							)
 						end
 					) as $bashbrewArch