Skip to content

Disable TLS for e2e docker-in-docker daemon - #2020

Merged
kolyshkin merged 1 commit into
docker:masterfrom
thaJeztah:fix_e2e
Jul 29, 2019
Merged

Disable TLS for e2e docker-in-docker daemon#2020
kolyshkin merged 1 commit into
docker:masterfrom
thaJeztah:fix_e2e

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Jul 29, 2019

Copy link
Copy Markdown
Member

relates to #1992

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.

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 <github@gone.nl>
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

ping @kolyshkin@tiborvass PTAL

@kolyshkinkolyshkin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kolyshkin
kolyshkin merged commit e065302 into docker:masterJul 29, 2019
@GordonTheTurtleGordonTheTurtle added this to the 19.09.0 milestone Jul 29, 2019
@thaJeztah
thaJeztah deleted the fix_e2e branch July 29, 2019 22:01
rgulewich pushed a commit to rgulewich/cli that referenced this pull request Jul 30, 2019
Disable TLS for e2e docker-in-docker daemon
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah@kolyshkin@GordonTheTurtle