Loading packaging.yml +7 −2 Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ variables: DOCKER_REGISTRY: ${CI_REGISTRY} DOCKER_REGISTRY_USER: gitlab-ci-token DOCKER_REGISTRY_PASS: ${CI_JOB_TOKEN} DOCKER_BUILD_ARGS: '' DOCKER_CACHE_ARGS: '' DOCKER_BUILD_ARGS: '--cache-from ${CI_REGISTRY_IMAGE}:latest' .docker: image: ${PACKAGING_IMAGE} Loading @@ -25,7 +26,11 @@ variables: .docker-operations-build: extends: .docker-operations script: - docker build ${DOCKER_BUILD_ARGS} -t ${DOCKER_DEFAULT_TAGGING} -t ${DOCKER_SPECIFIC_TAGGING} . - docker pull ${CI_REGISTRY_IMAGE}:latest || true - > docker build ${DOCKER_CACHE_ARGS} ${DOCKER_BUILD_ARGS} -t ${DOCKER_DEFAULT_TAGGING} -t ${DOCKER_SPECIFIC_TAGGING} . docker-build-support-branch: extends: .docker-operations-build Loading Loading
packaging.yml +7 −2 Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ variables: DOCKER_REGISTRY: ${CI_REGISTRY} DOCKER_REGISTRY_USER: gitlab-ci-token DOCKER_REGISTRY_PASS: ${CI_JOB_TOKEN} DOCKER_BUILD_ARGS: '' DOCKER_CACHE_ARGS: '' DOCKER_BUILD_ARGS: '--cache-from ${CI_REGISTRY_IMAGE}:latest' .docker: image: ${PACKAGING_IMAGE} Loading @@ -25,7 +26,11 @@ variables: .docker-operations-build: extends: .docker-operations script: - docker build ${DOCKER_BUILD_ARGS} -t ${DOCKER_DEFAULT_TAGGING} -t ${DOCKER_SPECIFIC_TAGGING} . - docker pull ${CI_REGISTRY_IMAGE}:latest || true - > docker build ${DOCKER_CACHE_ARGS} ${DOCKER_BUILD_ARGS} -t ${DOCKER_DEFAULT_TAGGING} -t ${DOCKER_SPECIFIC_TAGGING} . docker-build-support-branch: extends: .docker-operations-build Loading