Skip to content

Added SSL support #78

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.

Sign up for GitHub

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

Merged
marcuslinke merged 3 commits into from
Oct 24, 2014
Merged

Added SSL support #78

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a9b9e4
Added SSL support
sabre1041 Oct 19, 2014
2ce62f4
Removed options to specify keystore and truststore files. Added abili…
sabre1041 Oct 22, 2014
077df9f
Minor javadoc addition
sabre1041 Oct 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Minor javadoc addition
  • Loading branch information
@sabre1041
sabre1041 committed Oct 22, 2014
commit 077df9fad765e8b14c0decca302a1952e79a3e40
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/core/DockerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public DockerClientConfigBuilder() {

/**
* This will set all fields in the builder to those contained in the Properties object. The Properties object
* should contain the following docker.io.* keys: url, version, username, password, and email. If
* should contain the following docker.io.* keys: url, version, username, password, email, and dockerCertPath. If
* docker.io.readTimeout or docker.io.enableLoggingFilter are not contained, they will be set to 1000 and true,
* respectively.
*
Expand Down