diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-01 20:12:43 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-01 20:12:43 +0000 |
| commit | a80ee886e4b4a41ace5fb796bf920c4e395bf4dd (patch) | |
| tree | 2a1ed5cafebfb9f9989647060a385b928d05c240 | |
| parent | 85b855aa6ba070fc1d79d006075270cfcba33316 (diff) | |
| parent | ce4aae2379cc051aa43f73a6dff4044740f41f2b (diff) | |
| download | gitlab-ce-a80ee886e4b4a41ace5fb796bf920c4e395bf4dd.tar.gz | |
Merge branch 'fix-for-assets-image' into 'master'
Use CI_COMMIT_REF_SLUG when building assets image
See merge request gitlab-org/gitlab-ce!22756
| -rwxr-xr-x | scripts/build_assets_image | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 218606b9a40..1d77524d503 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -15,7 +15,7 @@ ASSETS_IMAGE_PATH=${CI_REGISTRY}/${CI_PROJECT_PATH}/${ASSETS_IMAGE_NAME} mkdir -p assets_container.build/public cp -r public/assets assets_container.build/public/ cp Dockerfile.assets assets_container.build/ -docker build -t ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} -f assets_container.build/Dockerfile.assets assets_container.build/ +docker build -t ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} -f assets_container.build/Dockerfile.assets assets_container.build/ docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} docker push ${ASSETS_IMAGE_PATH} |