diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-26 19:13:33 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-26 19:13:33 +0000 |
| commit | 7736e44adb29688c13da1f4c5bddf03bd878a0f3 (patch) | |
| tree | 78e4748a1f62954bf6569353d6cdd53f997a195f | |
| parent | 4b23d444761065d50efb60a6a49c17a7fe130763 (diff) | |
| parent | 9e7dff9fc1f216d297c950beff95d1bac8e764c5 (diff) | |
| download | buildstream-7736e44adb29688c13da1f4c5bddf03bd878a0f3.tar.gz | |
Merge branch 'bschubert/update-dind-ci' into 'master'
ci: Fix docker:dind service configuration
See merge request BuildStream/buildstream!1503
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 009999065..d5c37ed3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,6 +181,8 @@ tests-remote-execution: variables: DOCKER_HOST: tcp://docker:2375 DOCKER_DRIVER: overlay2 + # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 + DOCKER_TLS_CERTDIR: "" COMPOSE_MANIFEST: .gitlab-ci/buildgrid-compose.yml ARTIFACT_CACHE_SERVICE: http://docker:50052 REMOTE_EXECUTION_SERVICE: http://docker:50051 @@ -298,6 +300,8 @@ code_quality: stage: test variables: DOCKER_DRIVER: overlay2 + # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 + DOCKER_TLS_CERTDIR: "" allow_failure: true services: - docker:stable-dind |