Use job names as image name instead of tags and use CI_COMMIT_SHORT_SHA as tag

Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
Rémy Coutable 2020-02-13 17:00:29 +01:00
parent f48abf2d75
commit 4e5b5fa982
No known key found for this signature in database
GPG key ID: 98DFFD1C0C62B70B

View file

@ -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