diff --git a/Dockerfile b/Dockerfile index e30fbab..77c10c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,9 @@ RUN apt install -y g++-mingw-w64-x86-64 \ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +ENV CARGO_BIN=$HOME/.cargo/bin +ENV PATH=$CARGO_BIN:$PATH + ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ CC_armv7_unknown_Linux_gnueabihf=arm-linux-gnueabihf-gcc \ CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++ @@ -18,18 +21,10 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \ CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \ CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ -RUN $HOME/.cargo/bin/rustup target add x86_64-pc-windows-gnu -RUN $HOME/.cargo/bin/rustup toolchain install stable-x86_64-pc-windows-gnu - -RUN $HOME/.cargo/bin/rustup target add x86_64-unknown-linux-gnu -RUN $HOME/.cargo/bin/rustup toolchain install stable-x86_64-unknown-linux-gnu - -RUN $HOME/.cargo/bin/rustup target add armv7-unknown-linux-gnueabihf -RUN $HOME/.cargo/bin/rustup toolchain install stable-armv7-unknown-linux-gnueabihf - -RUN $HOME/.cargo/bin/rustup target add aarch64-unknown-linux-gnu -RUN $HOME/.cargo/bin/rustup toolchain install stable-aarch64-unknown-linux-gnu - -RUN $HOME/.cargo/bin/rustup target add wasm32-unknown-unknown -RUN $HOME/.cargo/bin/rustup toolchain install stable-wasm32-unknown-unknown +RUN $CARGO_BIN/rustup toolchain install stable-x86_64-unknown-linux-gnu +RUN $CARGO_BIN/rustup target add x86_64-pc-windows-gnu +RUN $CARGO_BIN/rustup target add x86_64-unknown-linux-gnu +RUN $CARGO_BIN/rustup target add armv7-unknown-linux-gnueabihf +RUN $CARGO_BIN/rustup target add aarch64-unknown-linux-gnu +RUN $CARGO_BIN/rustup target add wasm32-unknown-unknown