From f067e5de6bad4954db7e58289dd08d2a39297de4 Mon Sep 17 00:00:00 2001 From: bpinsard Date: Wed, 31 Jan 2024 11:37:45 -0500 Subject: [PATCH] fix tags: avoid MR to overwrite latest --- .gitlab-ci.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55a9792..919358b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,11 +35,18 @@ stages: - docker/${IMAGE_NAME}/**/* - .gitlab-ci.yml script: - - export IMAGE_TAG=$IMAGE:$CI_COMMIT_REF_SLUG + # main is latest, MR create tag from branch name + - export IMAGE_TAG=$IMAGE:${CI_COMMIT_REF_SLUG/main/latest} - echo $CI_REGISTRY_USER $CI_REGISTRY $IMAGE_TAG - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker pull $IMAGE:latest || true - - docker build --cache-from $IMAGE:latest -t $IMAGE:$CI_COMMIT_SHA -t $IMAGE:$CI_COMMIT_SHORT_SHA -t $IMAGE_TAG -t $IMAGE:latest ./docker/$IMAGE_NAME + - > + docker build + --cache-from $IMAGE:latest + -t $IMAGE:$CI_COMMIT_SHA + -t $IMAGE:$CI_COMMIT_SHORT_SHA + -t $IMAGE_TAG + ./docker/$IMAGE_NAME - docker push --all-tags $IMAGE build_all_dockers: