Skip to content

[18.09 backport] Disable TLS for e2e docker-in-docker daemon - #2021

Merged
kolyshkin merged 2 commits into
docker:18.09from
thaJeztah:18.09_backport_fix_e2e
Aug 8, 2019
Merged

[18.09 backport] Disable TLS for e2e docker-in-docker daemon#2021
kolyshkin merged 2 commits into
docker:18.09from
thaJeztah:18.09_backport_fix_e2e

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Jul 29, 2019

Copy link
Copy Markdown
Member

backport of #1992 and #2020

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.

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

ping @kolyshkin@silvin-lubecki ptal

The edge channel is deprecated and no longer updated
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 08fd6dd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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>
(cherry picked from commit b1a3c1a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed the 18.09_backport_fix_e2e branch from 8985b56 to 9c8ac0aCompareJuly 30, 2019 00:10
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

updated; added #1992

@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

@codecov-io

Copy link
Copy Markdown

Codecov Report

Merging #2021 into 18.09 will not change coverage.
The diff coverage is n/a.

@@ Coverage Diff @@## 18.09 #2021 +/- ##
=======================================
Coverage 54.29% 54.29% =======================================
Files 291 291 Lines 19459 19459 =======================================
Hits 10565 10565 Misses 8214 8214 Partials 680 680

@kolyshkin
kolyshkin merged commit 31c078b into docker:18.09Aug 8, 2019
@thaJeztah
thaJeztah deleted the 18.09_backport_fix_e2e branch August 8, 2019 00:43
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.

4 participants

@thaJeztah@codecov-io@kolyshkin@GordonTheTurtle