Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit eedf4e4

Browse files
committed
Added multi-arch for rust
1 parent fce763f commit eedf4e4

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

tools/rust/Dockerfile.template

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ ARG CARGO_HOME="${prefix}/opt/cargo" \
1515
RUN <<EOF
1616
curl -svLko /dev/null https://sh.rustup.rs
1717
curl https://sh.rustup.rs \
18-
--proto '=https' \
19-
--tlsv1.2 \
20-
--silent \
21-
--show-error \
22-
--fail | \
23-
env CARGO_HOME="${CARGO_HOME}" RUSTUP_HOME="${RUSTUP_HOME}" bash -s -- \
24-
--default-toolchain "${version}" \
25-
--no-modify-path \
26-
-y
18+
--proto '=https' \
19+
--tlsv1.2 \
20+
--silent \
21+
--show-error \
22+
--fail \
23+
| env CARGO_HOME="${CARGO_HOME}" RUSTUP_HOME="${RUSTUP_HOME}" bash -s -- \
24+
--default-toolchain "${version}" \
25+
--no-modify-path \
26+
-y
2727
EOF
2828
RUN <<EOF
2929
"${prefix}/opt/cargo/bin/rustup" completions bash rustup >"${prefix}${target}/share/bash-completion/completions/rustup"
3030
"${prefix}/opt/cargo/bin/rustup" completions fish rustup >"${prefix}${target}/share/fish/vendor_completions.d/rustup.fish"
3131
"${prefix}/opt/cargo/bin/rustup" completions zsh rustup >"${prefix}${target}/share/zsh/vendor-completions/_rustup"
3232
cp \
33-
"${prefix}/opt/rustup/toolchains/${version}-x86_64-unknown-linux-gnu/etc/bash_completion.d/cargo" \
33+
"${prefix}/opt/rustup/toolchains/${version}-${arch}-unknown-linux-gnu/etc/bash_completion.d/cargo" \
3434
"${prefix}${target}/share/bash-completion/completions/"
3535
cp \
36-
"${prefix}/opt/rustup/toolchains/${version}-x86_64-unknown-linux-gnu/share/zsh/site-functions/_cargo" \
36+
"${prefix}/opt/rustup/toolchains/${version}-${arch}-unknown-linux-gnu/share/zsh/site-functions/_cargo" \
3737
"${prefix}${target}/share/zsh/vendor-completions/"
3838
EOF
3939
RUN <<EOF

tools/rust/manifest.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: rust
22
version: "1.67.1"
33
binary: rustc
44
check: ${binary} --version | cut -d' ' -f2
5+
platforms:
6+
- linux/amd64
7+
- linux/arm64
58
tags:
69
- type/cli
710
- category/development

0 commit comments

Comments
 (0)