Skip to content

Env config #81

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 2 commits into from
Oct 26, 2014
Merged

Env config #81

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2114d0e
Updated DockerClientConfig so that environment properties can be used…
alexec Oct 26, 2014
80d1a3d
made method public
alexec Oct 26, 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
made method public
  • Loading branch information
@alexec
alexec committed Oct 26, 2014
commit 80d1a3d3d8b84b69cd7aa62aee1811a2da9c0bb3
41 changes: 23 additions & 18 deletions src/main/java/com/github/dockerjava/core/DockerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.github.dockerjava.core;
package com.github.dockerjava.core;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URI;
import java.util.Map;
import java.util.Properties;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URI;
import java.util.Map;
import java.util.Properties;

public class DockerClientConfig {
private static final String DOCKER_HOST_PROPERTY = "DOCKER_HOST";
Expand Down Expand Up @@ -257,9 +257,6 @@ public static class DockerClientConfigBuilder {
private Integer readTimeout;
private boolean loggingFilterEnabled;

private 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, email, and dockerCertPath. If
Expand All @@ -278,38 +275,46 @@ public DockerClientConfigBuilder withProperties(Properties p) {
}

public final DockerClientConfigBuilder withUri(String uri) {
Preconditions.checkNotNull(uri, "uri was not specified");
Preconditions.checkNotNull(uri, "uri was not specified");
this.uri = URI.create(uri);
return this;
}

public final DockerClientConfigBuilder withVersion(String version) {
this.version = version;
this.version = version;
return this;
}

public final DockerClientConfigBuilder withUsername(String username) {
this.username = username;
this.username = username;
return this;
}

public final DockerClientConfigBuilder withPassword(String password) {
this.password = password;
this.password = password;
return this;
}

public final DockerClientConfigBuilder withEmail(String email) {
this.email = email;
this.email = email;
return this;
}

public final DockerClientConfigBuilder withReadTimeout(Integer readTimeout) {
this.readTimeout = readTimeout;
this.readTimeout = readTimeout;
return this;
}

public final DockerClientConfigBuilder withLoggingFilter(boolean loggingFilterEnabled) {
this.loggingFilterEnabled = loggingFilterEnabled;
return this;
}

public final DockerClientConfigBuilder withDockerCertPath(String dockerCertPath) {
this.dockerCertPath = dockerCertPath;
return this;
}

public DockerClientConfig build() {
return new DockerClientConfig(
uri,
Expand Down