diff options
| author | Balasankar "Balu" C <balasankar@gitlab.com> | 2019-03-12 16:37:56 +0530 |
|---|---|---|
| committer | Balasankar "Balu" C <balasankar@gitlab.com> | 2019-03-12 16:41:50 +0530 |
| commit | 24426f37d7eb084f8dc68686249e3b3f0a0bb169 (patch) | |
| tree | 48ccff242d769f624d582e62f654a9e5d33d913d /scripts | |
| parent | e4b2c3b08b0aced417e072e60d5b299144c40474 (diff) | |
| download | gitlab-ce-24426f37d7eb084f8dc68686249e3b3f0a0bb169.tar.gz | |
Tag asset docker image with GitLab version also
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_assets_image | 6 | ||||
| -rwxr-xr-x | scripts/trigger-build | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 9afada244c8..b659bd751b2 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -27,3 +27,9 @@ docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_SHA} +# Also tag the image with GitLab version, if running on a tag pipeline, so +# other projects can simply use that instead of computing the slug. +if [ -n "$CI_COMMIT_TAG" ]; then + docker tag ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} + docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} +fi diff --git a/scripts/trigger-build b/scripts/trigger-build index 9dbafffddfc..9c5fc3c76a5 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -141,7 +141,7 @@ module Trigger "GITLAB_#{edition}_VERSION" => ENV['CI_COMMIT_REF_NAME'], "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'], "GITLAB_TAG" => ENV['CI_COMMIT_TAG'], - "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_REF_SLUG'], + "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'], "#{edition}_PIPELINE" => 'true' } end |