summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schubert <contact@benschubert.me>2019-07-26 14:09:26 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-07-26 18:45:14 +0000
commit9e7dff9fc1f216d297c950beff95d1bac8e764c5 (patch)
tree78e4748a1f62954bf6569353d6cdd53f997a195f
parent4b23d444761065d50efb60a6a49c17a7fe130763 (diff)
downloadbuildstream-9e7dff9fc1f216d297c950beff95d1bac8e764c5.tar.gz
ci: Fix docker connection to the docker dind service
docker 19 started requiring tls certificates to connect to. We now need to explicitely disable it. Gitlab was discussing it at https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 And the related change in docker was in https://github.com/docker-library/docker/pull/166
-rw-r--r--.gitlab-ci.yml4
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