X Tutup
Skip to content

Starts v0.10.0 #37

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 14 commits into from
Aug 2, 2014
Merged

Starts v0.10.0 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
134f241
Renames Response objects to match their assoc cmds
mfulgo Jul 31, 2014
dc0e625
Moves response objects to the commands package
mfulgo Jul 31, 2014
e904a40
Renames ImportImageCmd to CreateImageCmd
mfulgo Jul 31, 2014
4c21760
Adds test for CopyFileFromContainer
mfulgo Aug 1, 2014
65d4225
Swaps model toStrings with Commons ToStringBuilder
mfulgo Jul 31, 2014
442fa8b
Swaps responses' toStrings for Commons' ToStringBuilder
mfulgo Jul 31, 2014
476dafc
Moves CommitConfig into CommitCmd
mfulgo Aug 1, 2014
8d572c6
Fixes a bug in the InfoCmdTest
mfulgo Aug 1, 2014
14f911e
Adds some TODOs
mfulgo Aug 1, 2014
f8e3d3a
Moves more Config objects into their assoc Cmds
mfulgo Aug 1, 2014
52c7d2a
Removes top-level HostConfig
mfulgo Aug 1, 2014
b7bbcfe
Renames Config to DockerClientConfig
mfulgo Aug 1, 2014
a2b68c5
Removes setCredentials from DockerClient
mfulgo Aug 1, 2014
70aba65
Merge remote-tracking branch 'origin/master' into for-upstream-v0.10.0
mfulgo Aug 1, 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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<packaging>jar</packaging>
<version>0.9.2-SNAPSHOT</version>
<version>0.10.0-SNAPSHOT</version>

<name>docker-java</name>
<url>https://github.com/docker-java/docker-java</url>
Expand Down Expand Up @@ -147,7 +147,7 @@
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j-api.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down
136 changes: 36 additions & 100 deletions src/main/java/com/github/dockerjava/client/DockerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.dockerjava.client;

import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.commons.io.IOUtils.closeQuietly;

import java.io.*;
Expand All @@ -16,36 +17,6 @@
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.PoolingClientConnectionManager;

import com.github.dockerjava.client.command.AbstrDockerCmd;
import com.github.dockerjava.client.command.AttachContainerCmd;
import com.github.dockerjava.client.command.AuthCmd;
import com.github.dockerjava.client.command.BuildImgCmd;
import com.github.dockerjava.client.command.CommitCmd;
import com.github.dockerjava.client.command.ContainerDiffCmd;
import com.github.dockerjava.client.command.CopyFileFromContainerCmd;
import com.github.dockerjava.client.command.CreateContainerCmd;
import com.github.dockerjava.client.command.ImportImageCmd;
import com.github.dockerjava.client.command.InfoCmd;
import com.github.dockerjava.client.command.InspectContainerCmd;
import com.github.dockerjava.client.command.InspectImageCmd;
import com.github.dockerjava.client.command.KillContainerCmd;
import com.github.dockerjava.client.command.ListContainersCmd;
import com.github.dockerjava.client.command.ListImagesCmd;
import com.github.dockerjava.client.command.LogContainerCmd;
import com.github.dockerjava.client.command.PingCmd;
import com.github.dockerjava.client.command.PullImageCmd;
import com.github.dockerjava.client.command.PushImageCmd;
import com.github.dockerjava.client.command.RemoveContainerCmd;
import com.github.dockerjava.client.command.RemoveImageCmd;
import com.github.dockerjava.client.command.RestartContainerCmd;
import com.github.dockerjava.client.command.SearchImagesCmd;
import com.github.dockerjava.client.command.StartContainerCmd;
import com.github.dockerjava.client.command.StopContainerCmd;
import com.github.dockerjava.client.command.TagImageCmd;
import com.github.dockerjava.client.command.TopContainerCmd;
import com.github.dockerjava.client.command.VersionCmd;
import com.github.dockerjava.client.command.WaitContainerCmd;

import com.github.dockerjava.client.model.AuthConfig;

import com.github.dockerjava.client.utils.JsonClientFilter;
Expand All @@ -62,63 +33,60 @@
*/
public class DockerClient implements Closeable {

private Client client;
private final Client client;

private final CommandFactory cmdFactory;
private final WebResource baseResource;
private AuthConfig authConfig;

private final DockerClientConfig dockerClientConfig;

public DockerClient() {
this(Config.createDefaultConfigBuilder().build());
this(DockerClientConfig.createDefaultConfigBuilder().build());
}

public DockerClient(String serverUrl) {
this(configWithServerUrl(serverUrl));
}


private static Config configWithServerUrl(String serverUrl) {
return Config.createDefaultConfigBuilder()
private static DockerClientConfig configWithServerUrl(String serverUrl) {
return DockerClientConfig.createDefaultConfigBuilder()
.withUri(serverUrl)
.build();
}


public DockerClient(Config config) {
this(config, new DefaultCommandFactory());
public DockerClient(DockerClientConfig dockerClientConfig) {
this(dockerClientConfig, new DefaultCommandFactory());
}

public DockerClient(Config config, CommandFactory cmdFactory) {
public DockerClient(DockerClientConfig dockerClientConfig, CommandFactory cmdFactory) {
this.cmdFactory = cmdFactory;
this.dockerClientConfig = dockerClientConfig;

HttpClient httpClient = getPoolingHttpClient(config);
HttpClient httpClient = getPoolingHttpClient(dockerClientConfig);
ClientConfig clientConfig = new DefaultClientConfig();
client = new ApacheHttpClient4(new ApacheHttpClient4Handler(httpClient,
null, false), clientConfig);
if(config.getReadTimeout() != null) {
client.setReadTimeout(config.getReadTimeout());

if(dockerClientConfig.getReadTimeout() != null) {
client.setReadTimeout(dockerClientConfig.getReadTimeout());
}

client.addFilter(new JsonClientFilter());

if (config.isLoggingFilterEnabled())
if (dockerClientConfig.isLoggingFilterEnabled())
client.addFilter(new SelectiveLoggingFilter());
WebResource webResource = client.resource(config.getUri());
if(config.getVersion() != null) {
baseResource = webResource.path("v" + config.getVersion());

WebResource webResource = client.resource(dockerClientConfig.getUri());

if(dockerClientConfig.getVersion() != null) {
baseResource = webResource.path("v" + dockerClientConfig.getVersion());
} else {
baseResource = webResource;
}
}


private HttpClient getPoolingHttpClient(Config config) {
private HttpClient getPoolingHttpClient(DockerClientConfig dockerClientConfig) {
SchemeRegistry schemeRegistry = new SchemeRegistry();
schemeRegistry.register(new Scheme("http", config.getUri().getPort(),
schemeRegistry.register(new Scheme("http", dockerClientConfig.getUri().getPort(),
PlainSocketFactory.getSocketFactory()));
schemeRegistry.register(new Scheme("https", 443, SSLSocketFactory
.getSocketFactory()));
Expand All @@ -129,56 +97,25 @@ private HttpClient getPoolingHttpClient(Config config) {
// Increase default max connection per route
cm.setDefaultMaxPerRoute(1000);


return new DefaultHttpClient(cm);
}


public void setCredentials(String username, String password, String email) {
if (username == null) {
throw new IllegalArgumentException("username is null");
}
if (password == null) {
throw new IllegalArgumentException("password is null");
}
if (email == null) {
throw new IllegalArgumentException("email is null");
}
authConfig = new AuthConfig();
authConfig.setUsername(username);
authConfig.setPassword(password);
authConfig.setEmail(email);
}

public <RES_T> RES_T execute(AbstrDockerCmd<?, RES_T> command)
throws DockerException {
return command.withBaseResource(baseResource).exec();
}

public AuthConfig authConfig() throws DockerException {
return authConfig != null ? authConfig : authConfigFromProperties();
}

private static AuthConfig authConfigFromProperties() throws DockerException {
final AuthConfig a = new AuthConfig();

// TODO This should probably come from the Config used to create the DockerClient.
Config defaultConfig = Config.createDefaultConfigBuilder().build();
a.setUsername(defaultConfig.getUsername());
a.setPassword(defaultConfig.getPassword());
a.setEmail(defaultConfig.getEmail());
checkNotNull(dockerClientConfig.getUsername(), "Configured username is null.");
checkNotNull(dockerClientConfig.getPassword(), "Configured password is null.");
checkNotNull(dockerClientConfig.getEmail(), "Configured email is null.");

if (a.getUsername() == null) {
throw new IllegalStateException("username is null");
}
if (a.getPassword() == null) {
throw new IllegalStateException("password is null");
}
if (a.getEmail() == null) {
throw new IllegalStateException("email is null");
}

return a;
AuthConfig authConfig = new AuthConfig();
authConfig.setUsername(dockerClientConfig.getUsername());
authConfig.setPassword(dockerClientConfig.getPassword());
authConfig.setEmail(dockerClientConfig.getEmail());
// TODO Make the registry address configurable
return authConfig;
}

/**
Expand All @@ -195,7 +132,7 @@ public AuthCmd authCmd() {
public InfoCmd infoCmd() throws DockerException {
return cmdFactory.infoCmd().withBaseResource(baseResource);
}

public PingCmd pingCmd() {
return cmdFactory.pingCmd().withBaseResource(baseResource);
}
Expand All @@ -221,9 +158,8 @@ public PushImageCmd pushImageCmd(String name) {
// return execute(pushImageCmd(name));
// }

public ImportImageCmd importImageCmd(String repository,
InputStream imageStream) {
return cmdFactory.importImageCmd(repository, imageStream)
public CreateImageCmd createImageCmd(String repository, InputStream imageStream) {
return cmdFactory.createImageCmd(repository, imageStream)
.withBaseResource(baseResource);
}

Expand Down Expand Up @@ -326,7 +262,7 @@ public TagImageCmd tagImageCmd(String imageId, String repository, String tag) {
return cmdFactory.tagImageCmd(imageId, repository, tag).withBaseResource(baseResource);
}


// TODO This is only being used by the test code for logging. Is it really necessary?
/**
* @return The output slurped into a string.
*/
Expand Down
10 changes: 5 additions & 5 deletions .../com/github/dockerjava/client/Config.java → ...dockerjava/client/DockerClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

import com.google.common.base.Preconditions;

public class Config {
public class DockerClientConfig {
private final URI uri;
private final String version, username, password, email;
private final Integer readTimeout;
private final boolean loggingFilterEnabled;

private Config(DockerClientConfigBuilder builder) {
private DockerClientConfig(DockerClientConfigBuilder builder) {
this.uri = builder.uri;
this.version = builder.version;
this.username = builder.username;
Expand Down Expand Up @@ -55,7 +55,7 @@ public boolean isLoggingFilterEnabled() {
public static Properties loadIncludedDockerProperties() {
try {
Properties p = new Properties();
p.load(Config.class.getResourceAsStream("/docker.io.properties"));
p.load(DockerClientConfig.class.getResourceAsStream("/docker.io.properties"));
return p;
} catch (IOException e) {
throw new DockerException(e);
Expand Down Expand Up @@ -170,8 +170,8 @@ public final DockerClientConfigBuilder withLoggingFilter(boolean loggingFilterEn
this.loggingFilterEnabled = loggingFilterEnabled;
return this;
}
public Config build() {
return new Config(this);
public DockerClientConfig build() {
return new DockerClientConfig(this);
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/github/dockerjava/client/command/CommandFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public interface CommandFactory {
public ContainerDiffCmd containerDiffCmd(String containerId);
public CopyFileFromContainerCmd copyFileFromContainerCmd(String containerId, String resource);
public CreateContainerCmd createContainerCmd(String image);
public ImportImageCmd importImageCmd(String repository, InputStream imageStream);
public CreateImageCmd createImageCmd(String repository, InputStream imageStream);
public InfoCmd infoCmd();
public InspectContainerCmd inspectContainerCmd(String containerId);
public InspectImageCmd inspectImageCmd(String imageId);
Expand Down
Loading
X Tutup