From 5547ad688e4918010f05d2228e88d1b8f83e7da9 Mon Sep 17 00:00:00 2001 From: Emelie Graven Date: Tue, 3 Oct 2023 13:30:02 +0200 Subject: [PATCH] refactor: Split up commands into RUN steps --- Dockerfile | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85809bc..d8439bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,28 +3,28 @@ FROM docker.io/rust:bullseye ARG NIGHTLY_VERSION=nightly-2023-09-10 ENV NIGHTLY_VERSION=${NIGHTLY_VERSION} -RUN apt update -yqq \ - && apt install -yqq --no-install-recommends \ - build-essential cmake libssl-dev pkg-config git musl-tools jq xmlstarlet lcov protobuf-compiler libprotobuf-dev libprotoc-dev \ - && rustup toolchain uninstall /usr/local/rustup/toolchains/* \ - && rustup toolchain add $NIGHTLY_VERSION --component rustfmt --component clippy --component llvm-tools-preview \ - && rustup toolchain add stable --component rustfmt --component clippy --component llvm-tools-preview \ - && rustup default stable \ - && cargo install grcov \ - && cargo install cargo-cache \ - && cargo install cargo-llvm-cov \ - && cargo install cargo-deny \ - && cargo install sqlx-cli \ - && cargo install --git https://github.com/paritytech/cachepot \ - && cargo install --git https://github.com/FlixCoder/cargo-lints.git \ - && cargo install typos-cli \ - && cargo install conventional_commits_linter \ - && cargo install cargo-udeps --locked \ - && cargo install cargo-nextest \ - && cargo install cargo-readme \ - && cargo install gitlab-report \ - && cargo install cargo-audit \ - && cargo install cargo-vet \ - && cargo install --git https://github.com/kate-shine/cargo-license.git --branch shine/gitlab_license_scan --force # fix after it gets merged to upstream \ - && cargo cache -a +RUN apt update -yqq +RUN apt install -yqq --no-install-recommends \ + build-essential cmake libssl-dev pkg-config git musl-tools jq xmlstarlet lcov protobuf-compiler libprotobuf-dev libprotoc-dev +RUN rustup toolchain uninstall /usr/local/rustup/toolchains/* +RUN rustup toolchain add $NIGHTLY_VERSION --component rustfmt --component clippy --component llvm-tools-preview +RUN rustup toolchain add stable --component rustfmt --component clippy --component llvm-tools-preview +RUN rustup default stable +RUN cargo install grcov +RUN cargo install cargo-cache +RUN cargo install cargo-llvm-cov +RUN cargo install cargo-deny +RUN cargo install sqlx-cli +RUN cargo install --git https://github.com/paritytech/cachepot +RUN cargo install --git https://github.com/FlixCoder/cargo-lints.git +RUN cargo install typos-cli +RUN cargo install conventional_commits_linter +RUN cargo install cargo-udeps --locked +RUN cargo install cargo-nextest +RUN cargo install cargo-readme +RUN cargo install gitlab-report +RUN cargo install cargo-audit +RUN cargo install cargo-vet +RUN cargo install --git https://github.com/kate-shine/cargo-license.git --branch shine/gitlab_license_scan --force # fix after it gets merged to upstream +RUN cargo cache -a COPY cobertura_transform.xslt /opt/