From 64ae0f49f147cdbee3b3cfca524b5ca2555d32a0 Mon Sep 17 00:00:00 2001 From: Hypernova Sunnix Date: Thu, 15 Dec 2022 17:38:41 -0700 Subject: [PATCH 1/3] add cargodeny to dockerfile --- docker/build-tools/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/build-tools/Dockerfile b/docker/build-tools/Dockerfile index 5cfcff5f65..b9e923fba6 100644 --- a/docker/build-tools/Dockerfile +++ b/docker/build-tools/Dockerfile @@ -73,6 +73,7 @@ ENV KUBETEST2_VERSION=b019714a389563c9a788f119f801520d059b6533 ENV COSIGN_VERSION=v1.13.1 ENV CRANE_VERSION=v0.12.1 ENV TRIVY_VERSION=0.35.0 +ENV CARGODENY_VERSION=0.13.5 ENV GO111MODULE=on ENV GOPROXY=https://proxy.golang.org @@ -904,6 +905,10 @@ RUN rm -fr /usr/share/locale RUN rm -fr /usr/share/man RUN rm -fr /tmp/* +# Install cargo-deny +RUN curl -L "https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGODENY_VERSION}/cargo-deny-${CARGODENY_VERSION}-x86_64-unknown-linux-musl.tar.gz" --output - | \ +tar xz --strip-components=1 -C "/usr/bin/" "cargo-deny*/cargo-deny" + # Run config setup in local environments COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint From b9cb57c9c7c7aaaac6a87e67cd9581b30df4be4c Mon Sep 17 00:00:00 2001 From: Hypernova Sunnix Date: Thu, 19 Jan 2023 14:55:06 -0700 Subject: [PATCH 2/3] add targetarch --- docker/build-tools/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build-tools/Dockerfile b/docker/build-tools/Dockerfile index b9e923fba6..2c83521c91 100644 --- a/docker/build-tools/Dockerfile +++ b/docker/build-tools/Dockerfile @@ -906,7 +906,7 @@ RUN rm -fr /usr/share/man RUN rm -fr /tmp/* # Install cargo-deny -RUN curl -L "https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGODENY_VERSION}/cargo-deny-${CARGODENY_VERSION}-x86_64-unknown-linux-musl.tar.gz" --output - | \ +RUN curl -L "https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGODENY_VERSION}/cargo-deny-${CARGODENY_VERSION}-${TARGETARCH}-unknown-linux-musl.tar.gz" --output - | \ tar xz --strip-components=1 -C "/usr/bin/" "cargo-deny*/cargo-deny" # Run config setup in local environments From 68346a537132be1b3912d47bc4d91db72a18033d Mon Sep 17 00:00:00 2001 From: Hypernova Sunnix Date: Sat, 21 Jan 2023 11:43:25 -0700 Subject: [PATCH 3/3] move cargo deny curl up --- docker/build-tools/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/build-tools/Dockerfile b/docker/build-tools/Dockerfile index 2c83521c91..f88005b5a0 100644 --- a/docker/build-tools/Dockerfile +++ b/docker/build-tools/Dockerfile @@ -516,6 +516,11 @@ RUN curl --proto '=https' -v --tlsv1.2 -sSf https://sh.rustup.rs | \ /home/.cargo/bin/rustup default ${RUST_VERSION} &&\ mv /home/.cargo/bin/* /usr/bin +# Install cargo-deny +RUN curl -L "https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGODENY_VERSION}/cargo-deny-${CARGODENY_VERSION}-${TARGETARCH}-unknown-linux-musl.tar.gz" --output - | \ +tar xz --strip-components=1 -C "/usr/bin/" "cargo-deny*/cargo-deny" + + # Clean up stuff we don't need in the final image RUN rm -rf /var/lib/apt/lists/* RUN rm -fr /usr/share/python @@ -905,10 +910,6 @@ RUN rm -fr /usr/share/locale RUN rm -fr /usr/share/man RUN rm -fr /tmp/* -# Install cargo-deny -RUN curl -L "https://github.com/EmbarkStudios/cargo-deny/releases/download/${CARGODENY_VERSION}/cargo-deny-${CARGODENY_VERSION}-${TARGETARCH}-unknown-linux-musl.tar.gz" --output - | \ -tar xz --strip-components=1 -C "/usr/bin/" "cargo-deny*/cargo-deny" - # Run config setup in local environments COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint