diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-03-18 11:05:37 +0000 |
|---|---|---|
| committer | Balasankar "Balu" C <balasankar@gitlab.com> | 2019-04-12 10:11:38 +0530 |
| commit | 5f96ebc4856e0dcc10ff4cc08cf9d4fc41c53631 (patch) | |
| tree | fdf05109f51e5a87033ce86a7760b9ee5ecbf170 | |
| parent | 48528bcd6184e3e3421bde6f114be2cc9844c1b7 (diff) | |
| download | gitlab-ce-5f96ebc4856e0dcc10ff4cc08cf9d4fc41c53631.tar.gz | |
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
| -rwxr-xr-x | scripts/build_assets_image | 13 |
1 files 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} |