From 3079b0f60b121a96ce00ae7e86e7a19307831079 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 18 Sep 2023 17:01:41 +0200
Subject: [PATCH] Remove unnecessary tag, update comments
---
.gitlab-ci.yml | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e33d2ba..91d2b11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,9 +28,9 @@ image: docker:24
fi
- apk add gettext
- envsubst < ./Dockerfile.$LANGUAGE > Dockerfile
- # pull the latest build of the targeted versions
+ # pull the latest build of the targeted version of the current branch
- docker pull "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:$VERSIONS_TAG" || true
- # pull the latest build of the target R version in order to re-use it for the targeted SHINY_SERVER_VERSION
+ # pull the latest build of the target version of the main branch
- docker pull "$CI_REGISTRY_IMAGE/${LANGUAGE}:$VERSIONS_TAG" || true
# pull the latest build of this branch
- docker pull "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:latest" || true
@@ -41,7 +41,6 @@ image: docker:24
--build-arg SHINY_SERVER_VERSION
--cache-from "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:$VERSIONS_TAG"
--cache-from "$CI_REGISTRY_IMAGE/${LANGUAGE}:$VERSIONS_TAG"
- --tag "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"
--tag "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:latest"
--tag "$CI_REGISTRY_IMAGE/${LANGUAGE}:$VERSIONS_TAG"
--tag "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:$VERSIONS_TAG"
@@ -50,8 +49,6 @@ image: docker:24
./
# push image as latest for the current branch
- docker push "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:latest"
- # push image tagged with its sha
- - docker push "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"
# push image tagged with its versions
- docker push "$CI_REGISTRY_IMAGE/${LANGUAGE}/$CI_COMMIT_REF_SLUG:$VERSIONS_TAG"
# push image tagged with its versions and the commit sha (debug purpose)
--
GitLab