diff options
| author | Nick Thomas <nick@gitlab.com> | 2021-03-09 10:50:36 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2021-03-09 10:50:36 +0000 |
| commit | 2cdd633f118307a92e43aac75b49e2a82c026d43 (patch) | |
| tree | 67e847f5f1a49f80d3b52acd9224d5167fcffb72 | |
| parent | f2d15d40450b543341c4d040b1cdf719d380eebf (diff) | |
| parent | 29786338d24879534fa1235e53ca3838a65037ed (diff) | |
| download | gitlab-shell-2cdd633f118307a92e43aac75b49e2a82c026d43.tar.gz | |
Merge branch '512-docker-20.10.3' into 'main'
Use Docker 20.10.3 instead of 19.03.0 on build
Closes #512
See merge request gitlab-org/gitlab-shell!456
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ae65d2..fc588f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ include: - template: Security/Secret-Detection.gitlab-ci.yml variables: - DOCKER_VERSION: "19.03.0" + DOCKER_VERSION: "20.10.3" workflow: rules: &workflow_rules @@ -25,10 +25,6 @@ default: image: docker:${DOCKER_VERSION} services: - docker:${DOCKER_VERSION}-dind - variables: - DOCKER_DRIVER: overlay2 - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" tags: # See https://gitlab.com/gitlab-com/www-gitlab-com/-/issues/7019 for tag descriptions - gitlab-org-docker |