Commit 8bc24745 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

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
parents a52d7dfa 313022c7
......@@ -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}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment