Merge pull request #1904 from input-output-hk/custom-circle-ci-image

Use custom CircleCI image
input-output-hk · Mar 11, 2020 · 6ae562a · 6ae562a
2 parents b791928 + 5f0e997
commit 6ae562a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 41 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,8 +2,8 @@ version: 2
 jobs:
   cargo_fetch:
     docker:
-      - image: rust:latest
-    working_directory: /mnt/crate
+      - image: inputoutput/rust:stable
+    working_directory: /home/circleci/project
     steps:
       - checkout
       - run: git submodule sync
@@ -22,34 +22,35 @@ jobs:
 
   cargo_audit:
     docker:
-      - image: rust:latest
-    working_directory: /mnt/crate
+      - image: inputoutput/rust:stable
+    working_directory: /home/circleci/project
     steps:
       - checkout
       - run: git submodule sync
       - run: git submodule update --init
       - restore_cache:
           keys:
             - cargo-v3-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}
-      - run:
-          name: Install Cargo Audit
-          command: cargo install cargo-audit
+      - restore_cache:
+          keys:
+            - cargo-advisory-db-v1
       - run:
           name: Print Cargo Audit Version
           command: cargo audit --version
       - run:
           name: Check Cargo Audit
           command: cargo audit
+      - save_cache:
+          key: cargo-advisory-db-v1
+          paths:
+            - /usr/local/cargo/advisory-db
 
   rustfmt:
     docker:
-      - image: rust:latest
-    working_directory: /mnt/crate
+      - image: inputoutput/rust:stable
+    working_directory: /home/circleci/project
     steps:
       - checkout
-      - run:
-          name: Install rustfmt
-          command: rustup component add rustfmt
       - run:
           name: Print version information
           command: cargo fmt -- --version
@@ -59,10 +60,10 @@ jobs:
 
   test_debug:
     docker:
-      - image: rust:latest
+      - image: inputoutput/rust:stable
     environment:
       CARGO_INCREMENTAL: 0
-    working_directory: /mnt/crate
+    working_directory: /home/circleci/project
     steps:
       - checkout
       - run: git submodule sync
@@ -87,8 +88,8 @@ jobs:
 
   test_release:
     docker:
-      - image: rust:latest
-    working_directory: /mnt/crate
+      - image: inputoutput/rust:stable
+    working_directory: /home/circleci/project
     steps:
       - checkout
       - run: git submodule sync
@@ -114,7 +115,7 @@ jobs:
       - image: instrumentisto/rust:beta
     environment:
       CARGO_INCREMENTAL: 0
-    working_directory: /mnt/crate
+    working_directory: /home/circleci/project
     steps:
       - checkout
       - run: git submodule sync

diff --git a/docker/ci/Dockerfile.nightly b/docker/ci/Dockerfile.nightly
diff --git a/docker/ci/Dockerfile.release b/docker/ci/Dockerfile.release