From 5f96ebc4856e0dcc10ff4cc08cf9d4fc41c53631 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 18 Mar 2019 11:05:37 +0000 Subject: [PATCH] Merge branch 'rename-asset-image' into 'master' Set asset image name properly for all possible CE/EE project names See merge request gitlab-org/gitlab-ce!26217 --- scripts/build_assets_image | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 9afada244c8..ad5342fe3a1 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -7,14 +7,11 @@ then fi # Generate the image name based on the project this is being run in -ASSETS_IMAGE_NAME=$(echo ${CI_PROJECT_NAME} | - awk '{ - split($1, p, "-"); - interim = sprintf("%s-assets-%s", p[1], p[2]); - sub(/-$/, "", interim); - print interim - }' -) +ASSETS_IMAGE_NAME="gitlab-assets-ce" +if [[ "${CI_PROJECT_NAME}" == "gitlab-ee" ]] +then + ASSETS_IMAGE_NAME="gitlab-assets-ee" +fi ASSETS_IMAGE_PATH=${CI_REGISTRY}/${CI_PROJECT_PATH}/${ASSETS_IMAGE_NAME} -- GitLab