diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-29 12:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-29 12:08:42 +0300 |
commit | f22f6efffe139939114f2a6a29e9864c481e3010 (patch) | |
tree | f6ef38eb2b120ec789b0678661f576c540dc2ba2 /scripts | |
parent | 95085ac5cdbf6fcb12c6bdb167f663844d05147d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/build_assets_image | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 00f21e5dede..f43f930d64a 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -33,6 +33,11 @@ if ([ "${CI_PROJECT_NAME}" = "gitlab" ] && [ "${FOSS_ONLY}" != "1" ]) || ([ "${C ASSETS_IMAGE_NAME="gitlab-assets-ee" fi +# Generate this image for https://jihulab.com/gitlab-cn/gitlab and https://gitlab.com/gitlab-jh/jh-team/gitlab +if (["${CI_PROJECT_NAMESPACE}" = "gitlab-cn"] || ["${CI_PROJECT_NAMESPACE}" = "gitlab-jh"]); then + ASSETS_IMAGE_NAME="gitlab-assets-jh" +fi + ASSETS_IMAGE_PATH="${CI_REGISTRY}/${CI_PROJECT_PATH}/${ASSETS_IMAGE_NAME}" # Used in MR pipelines |