feat: allow building rust-cross for other toolchains

TheEdward162 · Mar 30, 2024 · 7b6f081 · 7b6f081
1 parent 93ed58d
commit 7b6f081
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/rust-cross.yaml b/.github/workflows/rust-cross.yaml
@@ -36,3 +36,5 @@ jobs:
           platforms: linux/amd64,linux/arm64
           tags: ${{ env.REGISTRY_IMAGE }}:${{ github.sha }},${{ env.REGISTRY_IMAGE }}:latest,${{ env.REGISTRY_IMAGE }}:${{ inputs.version }}
           push: true
+          build-args:
+            - "RUST_TOOLCHAIN=${{ inputs.version }}"
diff --git a/rust-cross.Dockerfile b/rust-cross.Dockerfile
@@ -1,8 +1,9 @@
-FROM rust:1.77-slim-bookworm
+FROM rust:slim-bookworm
 
 WORKDIR /tmp/rust-cross
 
-# Add any needed toolchains here
+ARG RUST_TOOLCHAIN=stable
+RUN rustup default "$RUST_TOOLCHAIN"
 RUN rustup target add \
 	aarch64-unknown-linux-musl aarch64-unknown-linux-gnu \
 	x86_64-unknown-linux-musl x86_64-unknown-linux-gnu \