From 4e5b5fa9826938cd2cfbd0123802b5fb91495720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Thu, 13 Feb 2020 17:00:29 +0100 Subject: [PATCH] Use job names as image name instead of tags and use CI_COMMIT_SHORT_SHA as tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- .gitlab-ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40172d2..b869df2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,8 +27,10 @@ before_script: .build_and_deploy: &build_and_deploy stage: build script: - - docker build -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" -f "Dockerfile.$CI_JOB_NAME" . - - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" + - docker build -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" -f "Dockerfile.$CI_JOB_NAME" . + - docker tag "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest" + - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" + - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest" only: - master @@ -45,8 +47,10 @@ before_script: .build_and_deploy_custom: &build_and_deploy_custom stage: build script: - - ./scripts/custom-docker-build $CI_JOB_NAME -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" - - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" + - ./scripts/custom-docker-build $CI_JOB_NAME -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" + - docker tag "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest" + - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" + - docker push "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:latest" only: - master