From 38a0cdbb4a6fb150eafa8e0f10c67714333b05b3 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Fri, 5 Aug 2022 11:51:35 -0400 Subject: [PATCH] fix: Install cargo deny in ci image (#5317) * fix: install cargo deny in ci image * fix: Update docker/Dockerfile.ci Co-authored-by: Carol (Nichols || Goulding) <193874+carols10cents@users.noreply.github.com> * fix: Apply suggestions from code review Co-authored-by: Marco Neumann Co-authored-by: Carol (Nichols || Goulding) <193874+carols10cents@users.noreply.github.com> Co-authored-by: Marco Neumann Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .circleci/config.yml | 2 +- docker/Dockerfile.ci | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 31e508c1a3..c0cf2618fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,7 +123,7 @@ jobs: - cache_restore - run: name: Install cargo-deny - command: cargo install --force cargo-deny + command: cargo install cargo-deny - run: name: cargo-deny Checks command: cargo deny check -s diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci index 141ace64f6..ab64777a01 100644 --- a/docker/Dockerfile.ci +++ b/docker/Dockerfile.ci @@ -58,9 +58,10 @@ RUN groupadd -g 1500 rust \ && echo 'rust ALL=NOPASSWD: ALL' >> /etc/sudoers.d/10-rust \ && echo 'Defaults env_keep += "DEBIAN_FRONTEND"' >> /etc/sudoers.d/env_keep -# Ensure we are ready with cargo hakari -RUN cargo install cargo-hakari -RUN chown -R rust:rust /usr/local/cargo +# Ensure we are ready with cargo hakari and cargo deny +RUN cargo install cargo-hakari && \ + cargo install cargo-deny && \ + chown -R rust:rust /usr/local/cargo USER rust ENV PATH /home/rust/.local/bin:/home/rust/bin:${PATH}