diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 495c0627d99ca612120f1f4efefbdb8f1a6cb54a..3a59f6307f0a8fc5895843db3a22600153bbe28c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,12 +47,11 @@ build-env-job: # This job runs in the build stage, which runs first. # docu: https://docs.gitlab.com/ee/ci/docker/using_kaniko.html, this is basically copy-pasted from there script: - mkdir -p /kaniko/.docker; - # - echo -n "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64)\"}}}" > /kaniko/.docker/config.json - - echo -n "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64 -w 0)\"}}}" | tee /kaniko/.docker/config.json + - echo -n "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64 -w 0)\"}},\"$(printf "%s" "$CI_DEPENDENCY_PROXY_SERVER" | cut -d':' -f1)\":{\"auth\":\"$( printf "%s:%s" "$CI_DEPENDENCY_PROXY_USER" "$CI_DEPENDENCY_PROXY_PASSWORD" | base64 -w 0 )\"}}}" | tee /kaniko/.docker/config.json - echo "CI_PROJECT_DIR=${CI_PROJECT_DIR}"; # In this task, Kaniko executor is called to build the Image based on the Dockerfile provided with "--dockerfile". - >- - echo /kaniko/executor + /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/gitlab-ci/Dockerfile" --destination "${IMAGE_TARGET}:latest"