Skip to content

Commit 431c08f

Browse files
committed
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).
1 parent 5eca4a0 commit 431c08f

File tree

8 files changed

+29
-1
lines changed

8 files changed

+29
-1
lines changed

1.19/alpine3.17/Dockerfile

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.19/alpine3.18/Dockerfile

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.20/alpine3.17/Dockerfile

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.20/alpine3.18/Dockerfile

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.21-rc/alpine3.17/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

1.21-rc/alpine3.18/Dockerfile

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-linux.template

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,24 @@ ENV GOLANG_VERSION {{ .version }}
3737
def os_arches:
3838
if is_alpine then
3939
{
40+
# https://dl-cdn.alpinelinux.org/alpine/edge/main/
41+
# https://dl-cdn.alpinelinux.org/alpine/latest-stable/main/
4042
amd64: "x86_64",
4143
arm32v6: "armhf",
4244
arm32v7: "armv7",
4345
arm64v8: "aarch64",
4446
i386: "x86",
4547
ppc64le: "ppc64le",
48+
riscv64: "riscv64",
4649
s390x: "s390x",
4750
}
4851
else
4952
{
53+
# https://salsa.debian.org/dpkg-team/dpkg/-/blob/main/data/cputable
54+
# https://wiki.debian.org/ArchitectureSpecificsMemo#Architecture_baselines
55+
# http://deb.debian.org/debian/dists/unstable/main/
56+
# http://deb.debian.org/debian/dists/stable/main/
57+
# https://deb.debian.org/debian-ports/dists/unstable/main/
5058
amd64: "amd64",
5159
arm32v5: "armel",
5260
arm32v7: "armhf",

versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ goVersions="$(
5858
.arch
5959
| sub("^386$"; "i386")
6060
| sub("^arm64$"; "arm64v8")
61-
| sub("^armv(?<v>[0-9]+)l?$"; "arm32v\(.v)")
61+
| sub("^arm-?v?(?<v>[0-9]+)l?$"; "arm32v\(.v)")
6262
)
6363
end
6464
) as $bashbrewArch

0 commit comments

Comments
 (0)