From f298fca893d206f37727027eb8b4f53a34f65346 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 24 Nov 2021 10:20:11 +0100 Subject: [PATCH] ci: use LOCAL_GIT_MIRROR in docker build job, if set When the build runner has a local git mirror configured via LOCAL_GIT_MIRROR variable, use that mirror when cloning IDF insider the docker build job. Follows similar logic for LOCAL_GITLAB_HTTPS_HOST, which is used for geo nodes. --- tools/ci/config/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ci/config/build.yml b/tools/ci/config/build.yml index 12d26d62d4..bd4bbcdd6e 100644 --- a/tools/ci/config/build.yml +++ b/tools/ci/config/build.yml @@ -374,6 +374,7 @@ build_docker: script: - export LOCAL_CI_REPOSITORY_URL=$CI_REPOSITORY_URL - if [ -n "$LOCAL_GITLAB_HTTPS_HOST" ]; then export LOCAL_CI_REPOSITORY_URL="https://gitlab-ci-token:${CI_JOB_TOKEN}@${LOCAL_GITLAB_HTTPS_HOST}/${CI_PROJECT_PATH}"; fi + - if [ -n "$LOCAL_GIT_MIRROR" ]; then export LOCAL_CI_REPOSITORY_URL="${LOCAL_GIT_MIRROR}/${CI_PROJECT_PATH}"; fi - echo "Using repository at $LOCAL_CI_REPOSITORY_URL" - export DOCKER_BUILD_ARGS="--build-arg IDF_CLONE_URL=${LOCAL_CI_REPOSITORY_URL} --build-arg IDF_CLONE_BRANCH_OR_TAG=${CI_COMMIT_REF_NAME} --build-arg IDF_CHECKOUT_REF=${CI_COMMIT_TAG:-$CI_COMMIT_SHA}" # Build