From a11a987bb34236756e607afe9d9428a3ef7e0dd9 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 17 Apr 2023 11:20:22 +0200
Subject: [PATCH] use cache in my-r-base

---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c67877..498597f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,11 +43,16 @@ build-my-r-base:
   script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     # pull the previous stage
-    - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/my-base:$CI_COMMIT_SHA"
+    - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/my-base:latest"
     # pull the latest build of the target R version in order to re-use it
     - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$R_VERSION" || true
+    # pull the latest build of the target R version in order to re-use it
+    - docker pull "$CI_REGISTRY_IMAGE:$R_VERSION" || true
     # building
     - docker build
+      --cache-from "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/my-base:latest"
+      --cache-from "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$R_VERSION"
+      --cache-from "$CI_REGISTRY_IMAGE:$R_VERSION"
       --build-arg R_VERSION
       --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/${STAGE_NAME}/${R_VERSION}:$CI_COMMIT_SHA"
       --file Dockerfile
-- 
GitLab