Fix TLS from environment variables in client #36270
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Introduced in #36140 |
A recent change accidently caused any TLS configuration in FromEnv to be ignored. This change alters WithHost to create a new http client only if one doesn't already exist, and otherwise applies the logic to the transport on the existing client. This preserves the TLS configuration that might already be on the client. Signed-off-by: Drew Erny <drew.erny@docker.com>
dperny
force-pushed
the
fix-client-tls
branch
from
dd6d2b2 to
80904e9
Compare
dnephin
approved these changes
Feb 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
- What I did
A recent change accidently caused any TLS configuration in FromEnv to be ignored. I fixed this so TLS works again.
- How I did it
This change alters WithHost to create a new http client only if one doesn't already exist, and otherwise applies the logic to the transport on the existing client. This preserves the TLS configuration that might already be on the client.
- How to verify it
Before change: use NewEnvClient to connect to a TLS-enabled daemon, note the TLS errors.
After change: note the lack of TLS errors.
- Description for the changelog
N/A, I don't think the bug was ever shipped
/cc @vdemeester for review, who
git blamesays committed the original changes to the client.