mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-11 02:52:56 +01:00
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:
parent
f48abf2d75
commit
4e5b5fa982
1 changed files with 8 additions and 4 deletions
|
|
@ -27,8 +27,10 @@ before_script:
|
||||||
.build_and_deploy: &build_and_deploy
|
.build_and_deploy: &build_and_deploy
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- docker build -t "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" -f "Dockerfile.$CI_JOB_NAME" .
|
- docker build -t "$CI_REGISTRY_IMAGE/$CI_JOB_NAME:$CI_COMMIT_SHORT_SHA" -f "Dockerfile.$CI_JOB_NAME" .
|
||||||
- docker push "$CI_REGISTRY_IMAGE:$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:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
|
@ -45,8 +47,10 @@ before_script:
|
||||||
.build_and_deploy_custom: &build_and_deploy_custom
|
.build_and_deploy_custom: &build_and_deploy_custom
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- ./scripts/custom-docker-build $CI_JOB_NAME -t "$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 push "$CI_REGISTRY_IMAGE:$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:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue