diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 15:09:17 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 15:09:17 +0300 |
| commit | 7db8721ff9eeb914afa30da7fb8df07ff6c10796 (patch) | |
| tree | 4c374647d1240dcb9e30749a8a968dc44ccfbdfa /scripts | |
| parent | 4372b0ca297cb4659bfcf81d511b70004bf365af (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_assets_image | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image index e6a5f036fe5..12beddfa184 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -20,21 +20,13 @@ cp Dockerfile.assets assets_container.build/ COMMIT_REF_SLUG_DESTINATION=${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} COMMIT_SHA_DESTINATION=${ASSETS_IMAGE_PATH}:${CI_COMMIT_SHA} +COMMIT_REF_NAME_DESTINATION=${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} DESTINATIONS="--destination=$COMMIT_REF_SLUG_DESTINATION --destination=$COMMIT_SHA_DESTINATION" -# For EE branch builds, add a truncated SHA destination for later use by Omnibus -# auto-deploy builds -if [[ "${ASSETS_IMAGE_NAME}" == "gitlab-assets-ee" ]] && [ -n "$CI_COMMIT_BRANCH" ] -then - COMMIT_SHORT_SHA_DESTINATION=${ASSETS_IMAGE_PATH}:${CI_COMMIT_SHA:0:11} - DESTINATIONS="$DESTINATIONS --destination=$COMMIT_SHORT_SHA_DESTINATION" -fi - # 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 - COMMIT_REF_NAME_DESTINATION=${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} DESTINATIONS="$DESTINATIONS --destination=$COMMIT_REF_NAME_DESTINATION" fi |