Commit 5666044a authored by Fabio Pitino's avatar Fabio Pitino

Merge branch 'suppress-progress-on-pulling-image-in-builtin-templates' into 'master'

Suppress progress on docker pulling in builtin templates

See merge request gitlab-org/gitlab!35253
parents 02cc59de a5ef2800
---
title: Suppress progress on docker pulling in builtin templates
merge_request: 35253
author: Takuya Noguchi
type: other
...@@ -20,7 +20,7 @@ stages: ...@@ -20,7 +20,7 @@ stages:
- docker:dind - docker:dind
script: script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG || true - docker pull --quiet $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG || true
- docker build --cache-from $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . - docker build --cache-from $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
......
...@@ -40,7 +40,7 @@ variables: ...@@ -40,7 +40,7 @@ variables:
- docker info - docker info
- env - env
- if [ -z "$SECURE_BINARIES_IMAGE" ]; then export SECURE_BINARIES_IMAGE=${SECURE_BINARIES_IMAGE:-"registry.gitlab.com/gitlab-org/security-products/analyzers/${CI_JOB_NAME}:${SECURE_BINARIES_ANALYZER_VERSION}"}; fi - if [ -z "$SECURE_BINARIES_IMAGE" ]; then export SECURE_BINARIES_IMAGE=${SECURE_BINARIES_IMAGE:-"registry.gitlab.com/gitlab-org/security-products/analyzers/${CI_JOB_NAME}:${SECURE_BINARIES_ANALYZER_VERSION}"}; fi
- docker pull ${SECURE_BINARIES_IMAGE} - docker pull --quiet ${SECURE_BINARIES_IMAGE}
- mkdir -p output/$(dirname ${CI_JOB_NAME}) - mkdir -p output/$(dirname ${CI_JOB_NAME})
- | - |
if [ "$SECURE_BINARIES_SAVE_ARTIFACTS" = "true" ]; then if [ "$SECURE_BINARIES_SAVE_ARTIFACTS" = "true" ]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment