diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdb8a9a..cb723f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ include: default: image: docker:git services: - - docker:19.03.0-dind + - docker:20.10.3-dind before_script: - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" "$CI_REGISTRY" - source scripts/build-helpers.sh @@ -41,7 +41,7 @@ variables: # Hack to set an array in /bin/sh # http://unix.stackexchange.com/a/137571 - set -- $CI_JOB_NAME - - docker pull "$CI_REGISTRY_IMAGE:$1" || true + - docker pull --quiet "$CI_REGISTRY_IMAGE:$1" || true - docker build --cache-from="$CI_REGISTRY_IMAGE:$1" -f "Dockerfile.$1" . .build_and_deploy: &build_and_deploy @@ -50,7 +50,7 @@ variables: # Hack to set an array in /bin/sh # http://unix.stackexchange.com/a/137571 - set -- $CI_JOB_NAME - - docker pull "$CI_REGISTRY_IMAGE:$1" || true + - docker pull --quiet "$CI_REGISTRY_IMAGE:$1" || true - docker build --cache-from="$CI_REGISTRY_IMAGE:$1" --label "ci_pipeline_url=$CI_PIPELINE_URL" --label "ci_job_url=$CI_JOB_URL" -t "$CI_REGISTRY_IMAGE:$1" -f "Dockerfile.$1" . - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME" diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index d2e8fd2..eb1acd5 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -304,7 +304,7 @@ function build_custom_if_needed() { full_image_name="$CI_REGISTRY_IMAGE:$build_image_name" # This re-uses and builds an existing image if needed - docker pull "$full_image" || true + docker pull --quiet "$full_image" || true docker_command=$(generate_command $@ --cache-from="$full_image_name" ) echo "Building $build_image_name with $docker_command" eval $docker_command