Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.03 backport] Disable TLS for e2e docker-in-docker daemon #2022

Merged
merged 2 commits into from
Aug 8, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 29, 2019

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
Member Author

ping @kolyshkin @silvin-lubecki ptal

@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (19.03@d473c60). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff            @@
##             19.03    #2022   +/-   ##
========================================
  Coverage         ?   56.75%           
========================================
  Files            ?      311           
  Lines            ?    21819           
  Branches         ?        0           
========================================
  Hits             ?    12384           
  Misses           ?     8521           
  Partials         ?      914

1 similar comment
@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (19.03@d473c60). Click here to learn what that means.
The diff coverage is n/a.

@@           Coverage Diff            @@
##             19.03    #2022   +/-   ##
========================================
  Coverage         ?   56.75%           
========================================
  Files            ?      311           
  Lines            ?    21819           
  Branches         ?        0           
========================================
  Hits             ?    12384           
  Misses           ?     8521           
  Partials         ?      914

The edge channel is deprecated and no longer updated

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 08fd6dd)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
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 <[email protected]>
(cherry picked from commit b1a3c1a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 19.03_backport_fix_e2e branch from f5b265c to f357def Compare July 30, 2019 00:11
@thaJeztah
Copy link
Member Author

updated; added #1992

Copy link
Contributor

@kolyshkin kolyshkin left a comment

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 fa0e259 into docker:19.03 Aug 8, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_fix_e2e branch August 8, 2019 00:43
Sign up for free to 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