Commit 22e6c99f authored by Thong Kuah's avatar Thong Kuah

Merge branch 'pin-auto-devops-dind-version' into 'master'

Pin Auto DevOps dind version to fix pull timeout

See merge request gitlab-org/gitlab!25286
parents 253783c1 c6602594
---
title: Pin Auto DevOps Docker-in-Docker service image to work around pull timeouts
merge_request: 25286
author:
type: fixed
performance: performance:
stage: performance stage: performance
image: docker:stable # pin to a version matching the dind service, just to be safe
image: docker:19.03.5
allow_failure: true allow_failure: true
variables: variables:
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
services: services:
- docker:stable-dind # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed
- docker:19.03.5-dind
script: script:
- | - |
if ! docker info &>/dev/null; then if ! docker info &>/dev/null; then
......
...@@ -4,7 +4,8 @@ build: ...@@ -4,7 +4,8 @@ build:
variables: variables:
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
services: services:
- docker:stable-dind # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed
- docker:19.03.5-dind
script: script:
- | - |
if [[ -z "$CI_COMMIT_TAG" ]]; then if [[ -z "$CI_COMMIT_TAG" ]]; then
......
code_quality: code_quality:
stage: test stage: test
image: docker:stable # pin to a version matching the dind service, just to be safe
image: docker:19.03.5
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed
- docker:19.03.5-dind
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
......
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