diff --git a/rust-nostd-esp/Dockerfile b/rust-nostd-esp/Dockerfile index 66a4cbb..c1c9a2f 100644 --- a/rust-nostd-esp/Dockerfile +++ b/rust-nostd-esp/Dockerfile @@ -8,9 +8,7 @@ USER esp ENV USER=esp # Install extra crates -RUN curl -L "https://github.com/rustsec/rustsec/releases/download/cargo-audit/v0.17.6/cargo-audit-x86_64-unknown-linux-gnu-v0.17.6.tgz" -o "${HOME}/.cargo/bin/cargo-audit.tgz" && \ - tar xf "${HOME}/.cargo/bin/cargo-audit.tgz" -C ${HOME}/.cargo/bin --strip-components 1 && \ - chmod u+x "${HOME}/.cargo/bin/cargo-audit" && \ +RUN cargo install cargo-audit && \ GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \ curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \ tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \ diff --git a/rust-std-esp/Dockerfile b/rust-std-esp/Dockerfile index 8602169..c0daf94 100644 --- a/rust-std-esp/Dockerfile +++ b/rust-std-esp/Dockerfile @@ -4,9 +4,7 @@ USER esp ENV USER=esp # Install extra crates -RUN curl -L "https://github.com/rustsec/rustsec/releases/download/cargo-audit/v0.17.6/cargo-audit-x86_64-unknown-linux-gnu-v0.17.6.tgz" -o "${HOME}/.cargo/bin/cargo-audit.tgz" && \ - tar xf "${HOME}/.cargo/bin/cargo-audit.tgz" -C ${HOME}/.cargo/bin --strip-components 1 && \ - chmod u+x "${HOME}/.cargo/bin/cargo-audit" && \ +RUN cargo install cargo-audit && \ GENERATE_VERSION=$(git ls-remote --refs --sort="version:refname" --tags "https://github.com/cargo-generate/cargo-generate" | cut -d/ -f3- | tail -n1) && \ curl -L "https://github.com/cargo-generate/cargo-generate/releases/latest/download/cargo-generate-${GENERATE_VERSION}-x86_64-unknown-linux-gnu.tar.gz" -o "${HOME}/.cargo/bin/cargo-generate.tar.gz" && \ tar xf "${HOME}/.cargo/bin/cargo-generate.tar.gz" -C ${HOME}/.cargo/bin && \