From 37de22774378cc59289dfc50140d3dc2f39dd56a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 29 Jul 2019 14:50:23 -0700 Subject: [PATCH] Disable TLS for e2e docker-in-docker daemon The docker-in-docker image now enables TLS by default (added in docker-library/docker#166), which complicates testing in our environment, and isn't needed for the tests we're running. This patch sets the `DOCKER_TLS_CERTDIR` to an empty value to disable TLS. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit b1a3c1aad1d802975af11c16fce1177f09d1d97e) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 9c8ac0a1233944b0b3929bb34edc66d27c290293 Component: cli --- components/cli/e2e/compose-env.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/cli/e2e/compose-env.yaml b/components/cli/e2e/compose-env.yaml index 09efd39645..5fa0243dfa 100644 --- a/components/cli/e2e/compose-env.yaml +++ b/components/cli/e2e/compose-env.yaml @@ -8,6 +8,8 @@ services: image: 'docker:${TEST_ENGINE_VERSION:-stable-dind}' privileged: true command: ['--insecure-registry=registry:5000'] + environment: + - DOCKER_TLS_CERTDIR= notary-server: build: