Allow SSL configuration from pre-existing keystore to be used#116
Merged
marcuslinke merged 2 commits intodocker-java:masterfrom Jan 7, 2015
magnayn:pr1
Merged
Allow SSL configuration from pre-existing keystore to be used#116marcuslinke merged 2 commits intodocker-java:masterfrom magnayn:pr1
marcuslinke merged 2 commits intodocker-java:masterfrom
magnayn:pr1
Conversation
Contributor
|
@magnayn Currently |
accessible on the local disk. This is inconvenient for some clients who may already have a pre-baked keystore in hand. Create different options for retrieving the neccessary SSLContext, so that the two different options can be used. Signed-off-by: Nigel Magnay <[email protected]>
SSLConfig. Signed-off-by: Nigel Magnay <[email protected]>
Contributor
Author
|
I've updated 'em - build (on my OS X box) now only fails with the same tests as /master does ;-) Let me know if it flies for you.. |
Contributor
|
@magnayn Thanks! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Rather than assuming that the relevant keys are present in the local filesystem.