From f504d1020eb7d611eeb718a1a90a3a37389d847a Mon Sep 17 00:00:00 2001 From: Lukas Gravley Date: Mon, 26 Apr 2021 13:35:25 -0500 Subject: [PATCH] pull rust in (#1488) --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b99f1d25..dadb3914 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,11 +85,11 @@ RUN ln -s /usr/bin/rustup-init /usr/bin/rustup \ && rustup toolchain install stable-x86_64-unknown-linux-musl \ && rustup component add rustfmt --toolchain=stable-x86_64-unknown-linux-musl \ && rustup component add clippy --toolchain=stable-x86_64-unknown-linux-musl \ - && mv /root/.rustup /tmp/.rustup \ - && ln -s /tmp/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/rustfmt /usr/bin/rustfmt \ - && ln -s /tmp/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/rustc /usr/bin/rustc \ - && ln -s /tmp/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/cargo /usr/bin/cargo \ - && ln -s /tmp/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/cargo-clippy /usr/bin/cargo-clippy \ + && mv /root/.rustup /usr/lib/.rustup \ + && ln -s /usr/lib/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/rustfmt /usr/bin/rustfmt \ + && ln -s /usr/lib/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/rustc /usr/bin/rustc \ + && ln -s /usr/lib/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/cargo /usr/bin/cargo \ + && ln -s /usr/lib/.rustup/toolchains/stable-x86_64-unknown-linux-musl/bin/cargo-clippy /usr/bin/cargo-clippy \ && echo '#!/usr/bin/env bash' > /usr/bin/clippy \ && echo 'pushd $(dirname $1)' >> /usr/bin/clippy \ && echo 'cargo-clippy' >> /usr/bin/clippy \ @@ -373,7 +373,6 @@ COPY --from=base_image /lib/ /lib/ COPY --from=base_image /bin/ /bin/ COPY --from=base_image /opt/microsoft/ /opt/microsoft/ COPY --from=base_image /node_modules/ /node_modules/ -COPY --from=base_image /tmp/.rustup/ /tmp/.rustup/ ######################################## # Add node packages to path and dotnet #