Skip to content

support DOCKER_TLS_VERIFY to detect ssl #123

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 1 commit into from
Jan 14, 2015
Merged

support DOCKER_TLS_VERIFY to detect ssl #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ In your application, e.g.
##### System Environment

export DOCKER_URL=http://localhost:2376

Note: we also auto-detect defaults. If you use `DOCKER_HOST` we use that value, and if `DOCKER_CERT_PATH` is set, we switch to SSL.

##### File System
Note: we also auto-detect defaults. If you use `DOCKER_HOST` we use that value, and if `DOCKER_CERT_PATH` or `DOCKER_TLS_VERIFY=1` is set, we switch to SSL.

##### File System

In `$HOME/.docker.io.properties`

Expand Down
3 changes: 2 additions & 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 @@ -21,6 +21,7 @@ public class DockerClientConfig implements Serializable {

private static final String DOCKER_HOST_PROPERTY = "DOCKER_HOST";
private static final String DOCKER_CERT_PATH_PROPERTY = "DOCKER_CERT_PATH";
private static final String DOCKER_VERIFY_TLS_PROPERTY = "DOCKER_TLS_VERIFY";
private static final String DOCKER_IO_URL_PROPERTY = "docker.io.url";
private static final String DOCKER_IO_VERSION_PROPERTY = "docker.io.version";
private static final String DOCKER_IO_USERNAME_PROPERTY = "docker.io.username";
Expand Down Expand Up @@ -142,7 +143,7 @@ private static Properties overrideDockerPropertiesWithEnv(Properties properties,

private static String protocol(Map<String, String> env) {
// if this is set, we assume we need SSL
return env.containsKey(DOCKER_CERT_PATH_PROPERTY) ? "https" : "http";
return env.containsKey(DOCKER_CERT_PATH_PROPERTY) || "1".equals(env.get(DOCKER_VERIFY_TLS_PROPERTY)) ? "https" : "http";
}

/**
Expand Down
34 changes: 33 additions & 1 deletion src/test/java/com/github/dockerjava/core/DockerClientConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void environmentDockerHost() throws Exception {
}

@Test
public void environmentDockerHostHttpsAutoDetect() throws Exception {
public void environmentDockerHostHttpsAutoDetectByCertPath() throws Exception {

// given docker host in env
Map<String, String> env = new HashMap<String, String>(System.getenv());
Expand All @@ -60,6 +60,38 @@ public void environmentDockerHostHttpsAutoDetect() throws Exception {
assertEquals(config.getUri(), URI.create("https://bar:8768"));
}

@Test
public void environmentDockerHostHttpsAutoDetectByTlsVerify() throws Exception {

// given docker host in env
Map<String, String> env = new HashMap<String, String>(System.getenv());
env.put("DOCKER_HOST", "tcp://bar:8768");
// and it looks to be SSL enabled
env.put("DOCKER_TLS_VERIFY", "1");

// when you build a config
DockerClientConfig config = buildConfig(env, new Properties());

// then the URL is that value with "tcp" changed to "https"
assertEquals(config.getUri(), URI.create("https://bar:8768"));
}

@Test
public void environmentDockerHostWithInvalidTlsVerify() throws Exception {

// given docker host in env
Map<String, String> env = new HashMap<String, String>(System.getenv());
env.put("DOCKER_HOST", "tcp://bar:8768");
// and it looks to be SSL enabled
env.put("DOCKER_TLS_VERIFY", "any value different from '1'");

// when you build a config
DockerClientConfig config = buildConfig(env, new Properties());

// then the URL is that value with "tcp" changed to "https"
assertEquals(config.getUri(), URI.create("http://bar:8768"));
}

@Test
public void environment() throws Exception {

Expand Down