From 868eacf1d595fc61b939ad066b0198a6b6c6961c Mon Sep 17 00:00:00 2001 From: Thomas Gideon Date: Tue, 11 Jun 2019 18:24:38 -0400 Subject: [PATCH] Move post-install to RUNs --- Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 022ecdf..d25fcd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,14 +51,18 @@ WORKDIR /home/rust RUN curl https://sh.rustup.rs -sSf -o rustup.sh && \ sh ./rustup.sh -y && \ - $HOME/.cargo/bin/rustup default $RUST_VER && \ - $HOME/.cargo/bin/rustup target add x86_64-pc-windows-gnu && \ - $HOME/.cargo/bin/rustup target add x86_64-apple-darwin && \ rm rustup.sh ENV PATH $PATH:/home/rust/.cargo/bin:/usr/osxcross/bin ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/osxcross/lib +RUN rustup default $RUST_VER +RUN rustup target add x86_64-pc-windows-gnu +RUN rustup target add x86_64-apple-darwin +RUN rustup component add clippy +RUN cargo install cargo-outdated +RUN cargo install cargo-audit + RUN cp /usr/x86_64-w64-mingw32/lib/*crt2.o \ /home/rust/.rustup/toolchains/1.35.0-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-pc-windows-gnu/lib/