From f5fe5e014779b400a26182370df0479ae228666e Mon Sep 17 00:00:00 2001 From: E Shattow Date: Tue, 14 Apr 2026 18:44:05 -0700 Subject: [PATCH] Add riscv64gc-unknown-linux-musl to the Alpine images MCP 982 promote riscv64-unknown-linux-musl to "with Tools" has landed in rust 1.99 and rustup 1.29.1, let's add support for it in docker-rust. --- .github/workflows/nightly.yml | 8 ++++---- nightly/alpine3.21/Dockerfile | 4 ++++ nightly/alpine3.22/Dockerfile | 4 ++++ nightly/alpine3.23/Dockerfile | 4 ++++ nightly/alpine3.24/Dockerfile | 4 ++++ stable/alpine3.21/Dockerfile | 4 ++++ stable/alpine3.22/Dockerfile | 4 ++++ stable/alpine3.23/Dockerfile | 4 ++++ stable/alpine3.24/Dockerfile | 4 ++++ x.py | 1 + 10 files changed, 37 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 77c2f2b..dca0abd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -46,22 +46,22 @@ jobs: nightly-slim - name: alpine3.21 context: nightly/alpine3.21 - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64 tags: | nightly-alpine3.21 - name: alpine3.22 context: nightly/alpine3.22 - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64 tags: | nightly-alpine3.22 - name: alpine3.23 context: nightly/alpine3.23 - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64 tags: | nightly-alpine3.23 - name: alpine3.24 context: nightly/alpine3.24 - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64 tags: | nightly-alpine3.24 nightly-alpine diff --git a/nightly/alpine3.21/Dockerfile b/nightly/alpine3.21/Dockerfile index 624eb41..a4322ca 100644 --- a/nightly/alpine3.21/Dockerfile +++ b/nightly/alpine3.21/Dockerfile @@ -29,6 +29,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/nightly/alpine3.22/Dockerfile b/nightly/alpine3.22/Dockerfile index 87bdca1..c6da1cc 100644 --- a/nightly/alpine3.22/Dockerfile +++ b/nightly/alpine3.22/Dockerfile @@ -29,6 +29,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/nightly/alpine3.23/Dockerfile b/nightly/alpine3.23/Dockerfile index c069af6..7479a6c 100644 --- a/nightly/alpine3.23/Dockerfile +++ b/nightly/alpine3.23/Dockerfile @@ -29,6 +29,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/nightly/alpine3.24/Dockerfile b/nightly/alpine3.24/Dockerfile index 15f8a2a..2490d54 100644 --- a/nightly/alpine3.24/Dockerfile +++ b/nightly/alpine3.24/Dockerfile @@ -29,6 +29,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/stable/alpine3.21/Dockerfile b/stable/alpine3.21/Dockerfile index 1eb68bf..4ebf165 100644 --- a/stable/alpine3.21/Dockerfile +++ b/stable/alpine3.21/Dockerfile @@ -28,6 +28,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/stable/alpine3.22/Dockerfile b/stable/alpine3.22/Dockerfile index 6069d57..73d2446 100644 --- a/stable/alpine3.22/Dockerfile +++ b/stable/alpine3.22/Dockerfile @@ -28,6 +28,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/stable/alpine3.23/Dockerfile b/stable/alpine3.23/Dockerfile index 9529df0..c25b8de 100644 --- a/stable/alpine3.23/Dockerfile +++ b/stable/alpine3.23/Dockerfile @@ -28,6 +28,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/stable/alpine3.24/Dockerfile b/stable/alpine3.24/Dockerfile index 07bc8a1..683d326 100644 --- a/stable/alpine3.24/Dockerfile +++ b/stable/alpine3.24/Dockerfile @@ -28,6 +28,10 @@ RUN set -eux; \ rustArch='powerpc64le-unknown-linux-musl'; \ rustupSha256='8bee6e9158cbfba278df2b28941e64450be4b4aac423881ee380d3e85f774deb'; \ ;; \ + 'riscv64') \ + rustArch='riscv64gc-unknown-linux-musl'; \ + rustupSha256='e29a1d528186309c19710c40a70ca4aa3bec975cbbeaa6b65493728e4366c89d'; \ + ;; \ *) \ echo >&2 "unsupported architecture: $arch"; \ exit 1; \ diff --git a/x.py b/x.py index ba4011e..a73575a 100755 --- a/x.py +++ b/x.py @@ -61,6 +61,7 @@ def arches(self) -> list[DebianArch]: AlpineArch("amd64", "x86_64", "linux/amd64", "x86_64-unknown-linux-musl"), AlpineArch("arm64v8", "aarch64", "linux/arm64", "aarch64-unknown-linux-musl"), AlpineArch("ppc64le", "ppc64le", "linux/ppc64le", "powerpc64le-unknown-linux-musl"), + AlpineArch("riscv64", "riscv64", "linux/riscv64", "riscv64gc-unknown-linux-musl"), ] latest_alpine_version = "3.24"