From 792ce891be360dc6fda975727e69cfb42a098977 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 10 Jul 2019 16:21:44 +0200 Subject: [PATCH 1/2] e2e: use stable-dind image for testing The edge channel is deprecated and no longer updated Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 08fd6dd63c6df48a479b0d81abfb168f9bea2c45) Signed-off-by: Sebastiaan van Stijn --- e2e/compose-env.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/compose-env.yaml b/e2e/compose-env.yaml index dd7b5a649a..ce1081432f 100644 --- a/e2e/compose-env.yaml +++ b/e2e/compose-env.yaml @@ -5,7 +5,7 @@ services: image: 'registry:2' engine: - image: 'docker:${TEST_ENGINE_VERSION:-edge-dind}' + image: 'docker:${TEST_ENGINE_VERSION:-stable-dind}' privileged: true command: ['--insecure-registry=registry:5000'] From f357def0361cc2ae5f101ac95dff486ba4cd86c2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 29 Jul 2019 14:50:23 -0700 Subject: [PATCH 2/2] 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 --- e2e/compose-env.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/e2e/compose-env.yaml b/e2e/compose-env.yaml index ce1081432f..a4c700c465 100644 --- a/e2e/compose-env.yaml +++ b/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: