From 529969d2810725477021d0ad49d8b8ef43ab5005 Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Mon, 23 May 2022 19:39:35 +0200
Subject: [PATCH 1/2] Install git and ssh for correct checkout

---
 .circleci/config.yml  | 9 +++++----
 docker/Dockerfile.dev | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 231c5a1ab7..d31cc9df89 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -58,6 +58,11 @@ commands:
         type: string
         default: ""
     steps:
+      - run:
+          name: Install git+ssh
+          environment:
+            DEBIAN_FRONTEND: noninteractive  # needed to install tzdata
+          command: apt update && apt install -y git ssh
       - checkout
       - check_changes
       - run:
@@ -124,10 +129,6 @@ jobs:
             - /root/.cache/pip
             - .mypy_cache
             - .pytest_cache
-      - run:
-          # Install curl for codecov upload
-          when: always
-          command: apt update && apt install -y curl
       - codecov/upload:
           when: always
           file: 'test-reports/coverage.xml'
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 4d5e42ed20..ef0d3df52c 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,8 +1,10 @@
 # To build this container, go to ESMValCore root folder and execute:
+# This container is used to run the tests on CircleCI.
 # docker build -t esmvalcore:development . -f docker/Dockerfile.dev
 FROM condaforge/mambaforge
 
 WORKDIR /src/ESMValCore
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt install curl git ssh && apt clean
 COPY environment.yml .
 RUN mamba update -y conda mamba pip && mamba env create --name esmvaltool --file environment.yml && conda clean --all -y
 

From e6683b297de00bdbb226029b6227aa22e58acd8d Mon Sep 17 00:00:00 2001
From: Bouwe Andela <b.andela@esciencecenter.nl>
Date: Mon, 23 May 2022 19:41:11 +0200
Subject: [PATCH 2/2] Fix apt install command

---
 docker/Dockerfile.dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index ef0d3df52c..3e9165cd5b 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -4,7 +4,7 @@
 FROM condaforge/mambaforge
 
 WORKDIR /src/ESMValCore
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install curl git ssh && apt clean
+RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y curl git ssh && apt clean
 COPY environment.yml .
 RUN mamba update -y conda mamba pip && mamba env create --name esmvaltool --file environment.yml && conda clean --all -y