Skip to content

Loading of custom DockerCmdExecFactory #83

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
Oct 28, 2014
Merged

Loading of custom DockerCmdExecFactory #83

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
Allow for custom implementations of DockerCmdExecFactory to be specif… 
…ied without attempting to load default
  • Loading branch information
@sabre1041
sabre1041 committed Oct 27, 2014
commit fc706edc6e10c97cdf20215477f443af75080f6d
30 changes: 14 additions & 16 deletions src/main/java/com/github/dockerjava/core/DockerClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,28 @@ public class DockerClientBuilder {
private static ServiceLoader<DockerCmdExecFactory> serviceLoader = ServiceLoader.load(DockerCmdExecFactory.class);

private DockerClientImpl dockerClient = null;
private DockerCmdExecFactory dockerCmdExecFactory = null;

private DockerClientBuilder(DockerClientImpl dockerClient) {
this.dockerClient = dockerClient;
}

public static DockerClientBuilder getInstance() {
return new DockerClientBuilder(withDefaultDockerCmdExecFactory(DockerClientImpl.getInstance()));
return new DockerClientBuilder(DockerClientImpl.getInstance());
}

public static DockerClientBuilder getInstance(DockerClientConfigBuilder dockerClientConfigBuilder) {
return getInstance(dockerClientConfigBuilder.build());
}

public static DockerClientBuilder getInstance(DockerClientConfig dockerClientConfig) {
return new DockerClientBuilder(withDefaultDockerCmdExecFactory(DockerClientImpl
.getInstance(dockerClientConfig)));
return new DockerClientBuilder(DockerClientImpl
.getInstance(dockerClientConfig));
}

public static DockerClientBuilder getInstance(String serverUrl) {
return new DockerClientBuilder(withDefaultDockerCmdExecFactory(DockerClientImpl
.getInstance(serverUrl)));
}

private static DockerClientImpl withDefaultDockerCmdExecFactory(
DockerClientImpl dockerClient) {

DockerCmdExecFactory dockerCmdExecFactory = getDefaultDockerCmdExecFactory();

return dockerClient
.withDockerCmdExecFactory(dockerCmdExecFactory);
return new DockerClientBuilder(DockerClientImpl
.getInstance(serverUrl));
}

public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {
Expand All @@ -53,12 +45,18 @@ public static DockerCmdExecFactory getDefaultDockerCmdExecFactory() {

public DockerClientBuilder withDockerCmdExecFactory(
DockerCmdExecFactory dockerCmdExecFactory) {
dockerClient = dockerClient
.withDockerCmdExecFactory(dockerCmdExecFactory);
this.dockerCmdExecFactory = dockerCmdExecFactory;
return this;
}

public DockerClient build() {
if(dockerCmdExecFactory != null) {
dockerClient.withDockerCmdExecFactory(dockerCmdExecFactory);
}
else {
dockerClient.withDockerCmdExecFactory(getDefaultDockerCmdExecFactory());
}

return dockerClient;
}
}