Commit f9c2abce authored by Matija Čupić's avatar Matija Čupić

Merge branch 'update-auto-devops-templates-to-docker-20-x' into 'master'

Update Auto DevOps docker versions to 20.x

See merge request gitlab-org/gitlab!82353
parents 30d600ef f71efa77
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
browser_performance: browser_performance:
stage: performance stage: performance
image: docker:19.03.12 image: docker:20.10.12
allow_failure: true allow_failure: true
variables: variables:
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
...@@ -10,7 +10,8 @@ browser_performance: ...@@ -10,7 +10,8 @@ browser_performance:
SITESPEED_VERSION: 14.1.0 SITESPEED_VERSION: 14.1.0
SITESPEED_OPTIONS: '' SITESPEED_OPTIONS: ''
services: services:
- docker:19.03.12-dind - name: 'docker:20.10.12-dind'
command: ['--tls=false', '--host=tcp://0.0.0.0:2375']
script: script:
- | - |
if ! docker info &>/dev/null; then if ! docker info &>/dev/null; then
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
browser_performance: browser_performance:
stage: performance stage: performance
image: docker:19.03.12 image: docker:20.10.12
allow_failure: true allow_failure: true
variables: variables:
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
...@@ -10,7 +10,8 @@ browser_performance: ...@@ -10,7 +10,8 @@ browser_performance:
SITESPEED_VERSION: 14.1.0 SITESPEED_VERSION: 14.1.0
SITESPEED_OPTIONS: '' SITESPEED_OPTIONS: ''
services: services:
- docker:19.03.12-dind - name: 'docker:20.10.12-dind'
command: ['--tls=false', '--host=tcp://0.0.0.0:2375']
script: script:
- | - |
if ! docker info &>/dev/null; then if ! docker info &>/dev/null; then
......
code_quality: code_quality:
stage: test stage: test
image: docker:19.03.12 image: docker:20.10.12
allow_failure: true allow_failure: true
services: services:
- docker:19.03.12-dind - name: 'docker:20.10.12-dind'
command: ['--tls=false', '--host=tcp://0.0.0.0:2375']
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
......
load_performance: load_performance:
stage: performance stage: performance
image: docker:19.03.11 image: docker:20.10.12
allow_failure: true allow_failure: true
variables: variables:
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
...@@ -10,7 +10,8 @@ load_performance: ...@@ -10,7 +10,8 @@ load_performance:
K6_OPTIONS: '' K6_OPTIONS: ''
K6_DOCKER_OPTIONS: '' K6_DOCKER_OPTIONS: ''
services: services:
- docker:19.03.11-dind - name: 'docker:20.10.12-dind'
command: ['--tls=false', '--host=tcp://0.0.0.0:2375']
script: script:
- | - |
if ! docker info &>/dev/null; then if ! docker info &>/dev/null; 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