From 43deee44a5b52ac9c7c22e2c2d35f3b6e58e5fe6 Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Fri, 15 Jul 2022 15:47:31 +0200
Subject: [PATCH 1/4] Use rust:latest

---
 .circleci/config.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d005763..b838a47 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,7 +11,7 @@ version: 2.1
 jobs:
   test:
     docker:
-      - image: mozilla/cidockerbases:rust-2022-04-23
+      - image: rust:latest
     steps:
       - checkout
       - download-geolite
@@ -24,9 +24,15 @@ jobs:
 
   lint:
     docker:
-      - image: mozilla/cidockerbases:rust-2022-04-23
+      - image: rust:latest
     steps:
       - checkout
+      - run:
+          name: Setup Rust
+          command: |
+            rustup component add rustfmt
+            rustup component add clippy
+            cargo install cargo-audit
       - run:
           name: Rustfmt
           command: cargo fmt -- --check

From f4bebcb0da4095ac38745787d9b98b467e40365f Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Fri, 15 Jul 2022 15:47:45 +0200
Subject: [PATCH 2/4] Use cimg/base:current for docker steps

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b838a47..82faf91 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,7 +48,7 @@ jobs:
 
   build:
     docker:
-      - image: mozilla/cidockerbases:docker-2022-04-23
+      - image: cimg/base:current
     working_directory: /dockerflow
     steps:
       - checkout
@@ -81,7 +81,7 @@ jobs:
 
   publish:
     docker:
-      - image: mozilla/cidockerbases:docker-2022-04-23
+      - image: cimg/base:current
     steps:
       - setup_remote_docker
       - restore_cache:

From e50273816f2998d70f2ea5c4ff9b94ee0fa6414f Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Fri, 15 Jul 2022 15:50:44 +0200
Subject: [PATCH 3/4] Do not set working directory explicitly

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 82faf91..7fb5923 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,6 @@ jobs:
   build:
     docker:
       - image: cimg/base:current
-    working_directory: /dockerflow
     steps:
       - checkout
       - setup_remote_docker

From f72bc136e6fadb2a47ac6b79c05b76461396fb94 Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Fri, 15 Jul 2022 15:59:24 +0200
Subject: [PATCH 4/4] Save Docker image in /tmp

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7fb5923..938ad47 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,11 +72,11 @@ jobs:
       # required since Workflows do not have the same remote docker instance.
       - run:
           name: docker save app:build
-          command: mkdir -p /cache; docker save -o /cache/docker.tar "app:build"
+          command: mkdir -p /tmp; docker save -o /tmp/docker.tar "app:build"
       - save_cache:
           key: v1-{{ .Branch }}-{{epoch}}
           paths:
-            - /cache/docker.tar
+            - /tmp/docker.tar
 
   publish:
     docker:
@@ -87,7 +87,7 @@ jobs:
           key: v1-{{.Branch}}
       - run:
           name: Restore Docker image cache
-          command: docker load -i /cache/docker.tar
+          command: docker load -i /tmp/docker.tar
 
       - run:
           name: Deploy to Dockerhub