diff options
| author | Marin Jankovski <marin@gitlab.com> | 2019-03-18 11:05:37 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2019-03-18 11:05:37 +0000 |
| commit | 8bc2474553f302d4feb41cb55ffb90c5b72e94c3 (patch) | |
| tree | 0c19b65d051a5574a88530a805803ce2c9750ae4 | |
| parent | a52d7dfaa9b72e4442a1723d30b84bc349b27215 (diff) | |
| parent | 313022c79ade12b735293bc11a659b6d281bc5ac (diff) | |
| download | gitlab-ce-8bc2474553f302d4feb41cb55ffb90c5b72e94c3.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 b659bd751b2..25b6060b6c4 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} |