diff options
| author | Tomasz Maczukin <tomasz@gitlab.com> | 2019-07-29 12:49:08 +0000 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@gitlab.com> | 2019-07-29 12:49:08 +0000 |
| commit | 014fa575f9b1a2d77045d0ff886f959faddc2e03 (patch) | |
| tree | b8929fcb211f5beceaed2e2027f3e516732462fe | |
| parent | Merge branch '4407-cleanup-commands-config-go-file' into 'master' (diff) | |
| parent | Switch to DinD TLS for GitLab CI (diff) | |
| download | gitlab-runner-014fa575f9b1a2d77045d0ff886f959faddc2e03.tar.gz | |
Merge branch 'use-dind-with-tls' into 'master'
Switch to DinD TLS for GitLab CI
See merge request gitlab-org/gitlab-runner!1504
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e89cc4ad..c2ebdc09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,11 +45,14 @@ image: $CI_IMAGE .docker: &docker <<: *except_docs services: - - docker:dind + - docker:19.03-dind variables: &docker_variables CI_IMAGE: registry.gitlab.com/gitlab-org/gitlab-runner/ci:1.8.7-2 DOCKER_DRIVER: overlay2 - DOCKER_HOST: tcp://docker:2375 + DOCKER_HOST: tcp://docker:2376 + DOCKER_TLS_VERIFY: 1 + DOCKER_TLS_CERTDIR: "/certs" + DOCKER_CERT_PATH: "/certs/client" tags: - docker @@ -76,7 +79,7 @@ image: $CI_IMAGE .image_builder: &image_builder <<: *docker stage: prepare - image: docker:git + image: docker:19.03-git script: - source ./ci/build_ci_image @@ -232,9 +235,9 @@ check feature flags docs: code_quality: <<: *except_docs stage: test - image: docker:git + image: docker:19.03-git services: - - docker:dind + - docker:19.03-dind variables: DOCKER_DRIVER: overlay2 CODECLIMATE_FORMAT: json |