docker-java · marcuslinke · Jan 21, 2015 · Jan 16, 2015 · Jan 17, 2015 · Jan 18, 2015
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+.git/
+target/
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,18 @@
+FROM java:7
+MAINTAINER https://github.com/docker-java/docker-java
+
+ENV HOME /root
+ENV M2_HOME /opt/apache-maven-3.0.5
+
+RUN wget http://www.eu.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz -O /tmp/apache-maven-3.0.5-bin.tar.gz \
+    && cd /tmp \
+    && tar xzf apache-maven-3.0.5-bin.tar.gz \
+    && mkdir -p /opt \
+    && mv apache-maven-3.0.5 /opt \
+    && rm apache-maven-3.0.5-bin.tar.gz
+
+WORKDIR /project
+ADD . /project/
+
+#ENTRYPOINT $M2_HOME/bin/mvn
+CMD $M2_HOME/bin/mvn verify
diff --git a/pom.xml b/pom.xml
@@ -39,6 +39,13 @@
 		</developer>
 	</developers>
 
+	<repositories>
+		<repository>
+			<id>jcenter</id>
+			<url>http://jcenter.bintray.com</url>
+		</repository>
+	</repositories>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -64,6 +71,7 @@
 		<jnr.unixsocket.version>0.3</jnr.unixsocket.version>
 		<guava.version>18.0</guava.version>
 		<bouncycastle.version>1.51</bouncycastle.version>
+		<unix-socket-factory.version>2014-11-16T14-41-27</unix-socket-factory.version>
 
 		<!--test dependencies -->
 		<version.logback>1.0.1</version.logback>
@@ -93,12 +101,23 @@
 		<!-- <artifactId>jersey-jetty-connector</artifactId> -->
 		<!-- <version>${jersey.version}</version> -->
 		<!-- </dependency> -->
+		<dependency>
+	 		<groupId>org.glassfish.jersey.connectors</groupId>
+			<artifactId>jersey-apache-connector</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
 			<artifactId>jersey-client</artifactId>
 			<version>${jersey.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>de.gesellix</groupId>
+			 <artifactId>unix-socket-factory</artifactId>
+		 	<version>${unix-socket-factory.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>

diff --git a/src/main/java/com/github/dockerjava/api/command/EventCallback.java b/src/main/java/com/github/dockerjava/api/command/EventCallback.java
@@ -9,4 +9,5 @@ public interface EventCallback {
     public void onEvent(Event event);
     public void onException(Throwable throwable);
     public void onCompletion(int numEvents);
+    public boolean isReceiving();
 }
diff --git a/src/main/java/com/github/dockerjava/api/model/AuthConfig.java b/src/main/java/com/github/dockerjava/api/model/AuthConfig.java
@@ -8,7 +8,7 @@ public class AuthConfig {
     /**
      * For backwards compatibility. Make sure you update the properties if you change this.
      *
-     * @see /docker.io.properties
+     * @see "/docker.io.properties"
      */
     public static final String DEFAULT_SERVER_ADDRESS = "https://index.docker.io/v1/";
 

diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -33,6 +33,9 @@ public class DockerClientConfig implements Serializable {
     private static final String DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY = "docker.io.enableLoggingFilter";
     private static final String DOCKER_IO_DOCKER_CERT_PATH_PROPERTY = "docker.io.dockerCertPath";
     private static final String DOCKER_IO_DOCKER_CFG_PATH_PROPERTY = "docker.io.dockerCfgPath";
+    // connection pooling properties
+    private static final String DOCKER_IO_MAX_PER_ROUTE_PROPERTY = "docker.io.perRouteConnections";
+    private static final String DOCKER_IO_MAX_TOTAL_PROPERTY = "docker.io.totalConnections";
     /**
      * A map from the environment name to the interval name.
      */
@@ -49,13 +52,18 @@ public class DockerClientConfig implements Serializable {
             .put("DOCKER_CFG_PATH", DOCKER_IO_DOCKER_CFG_PATH_PROPERTY)
             .build();
     private static final String DOCKER_IO_PROPERTIES_PROPERTY = "docker.io.properties";
-    private final URI uri;
+    private URI uri;
     private final String version, username, password, email, serverAddress, dockerCfgPath;
     private final Integer readTimeout;
     private final boolean loggingFilterEnabled;
     private final SSLConfig sslConfig;
+
+    private final int maxTotalConnections;
+    private final int maxPerRouteConnections;
 
-    DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress, String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled, SSLConfig sslConfig) {
+    DockerClientConfig(URI uri, String version, String username, String password, String email, String serverAddress,
+                       String dockerCfgPath, Integer readTimeout, boolean loggingFilterEnabled, SSLConfig sslConfig,
+                       int maxTotalConns, int maxPerRouteConns) {
         this.uri = uri;
         this.version = version;
         this.username = username;
@@ -66,6 +74,8 @@ public class DockerClientConfig implements Serializable {
         this.readTimeout = readTimeout;
         this.loggingFilterEnabled = loggingFilterEnabled;
         this.sslConfig = sslConfig;
+        this.maxTotalConnections = maxTotalConns;
+        this.maxPerRouteConnections = maxPerRouteConns;
     }
 
     private static Properties loadIncludedDockerProperties(Properties systemProperties) {
@@ -194,6 +204,10 @@ public URI getUri() {
         return uri;
     }
 
+    public void setUri(URI uri) {
+		this.uri = uri;
+	}
+
     public String getVersion() {
         return version;
     }
@@ -329,7 +343,7 @@ public String toString() {
     public static class DockerClientConfigBuilder {
         private URI uri;
         private String version, username, password, email, serverAddress, dockerCfgPath;
-        private Integer readTimeout;
+        private Integer readTimeout, maxTotalConnections, maxPerRouteConnections;
         private boolean loggingFilterEnabled;
         private SSLConfig sslConfig;
 
@@ -349,7 +363,10 @@ public DockerClientConfigBuilder withProperties(Properties p) {
                     .withReadTimeout(Integer.valueOf(p.getProperty(DOCKER_IO_READ_TIMEOUT_PROPERTY, "0")))
                     .withLoggingFilter(Boolean.valueOf(p.getProperty(DOCKER_IO_ENABLE_LOGGING_FILTER_PROPERTY, "true")))
                     .withDockerCertPath(p.getProperty(DOCKER_IO_DOCKER_CERT_PATH_PROPERTY))
-                    .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY));
+                    .withDockerCfgPath(p.getProperty(DOCKER_IO_DOCKER_CFG_PATH_PROPERTY))
+                    .withMaxPerRouteConnections(Integer.valueOf(p.getProperty(DOCKER_IO_MAX_PER_ROUTE_PROPERTY, "2")))
+                    .withMaxTotalConnections(Integer.valueOf(p.getProperty(DOCKER_IO_MAX_TOTAL_PROPERTY, "20")))
+                    ;
         }
 
         public final DockerClientConfigBuilder withUri(String uri) {
@@ -387,6 +404,16 @@ public final DockerClientConfigBuilder withReadTimeout(Integer readTimeout) {
             this.readTimeout = readTimeout;
             return this;
         }
+
+        public final DockerClientConfigBuilder withMaxTotalConnections(Integer maxTotalConnections) {
+            this.maxTotalConnections = maxTotalConnections;
+            return this;
+        }
+
+        public final DockerClientConfigBuilder withMaxPerRouteConnections(Integer maxPerRouteConnections) {
+            this.maxPerRouteConnections = maxPerRouteConnections;
+            return this;
+        }
 
         public final DockerClientConfigBuilder withLoggingFilter(boolean loggingFilterEnabled) {
             this.loggingFilterEnabled = loggingFilterEnabled;
@@ -420,8 +447,18 @@ public DockerClientConfig build() {
                     dockerCfgPath,
                     readTimeout,
                     loggingFilterEnabled,
-                    sslConfig
+                    sslConfig,
+                    maxTotalConnections,
+                    maxPerRouteConnections
             );
         }
     }
+
+    public int getMaxTotalConnections() {
+      return maxTotalConnections;
+    }
+
+    public int getMaxPerRoutConnections() {
+      return maxPerRouteConnections;
+    }
 }
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -8,18 +8,15 @@
 import java.io.InputStream;
 
 import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.api.command.*;
 import com.github.dockerjava.api.model.AuthConfig;
-import com.github.dockerjava.core.NameParser.HostnameReposName;
-import com.github.dockerjava.core.NameParser.ReposTag;
 import com.github.dockerjava.core.command.*;
 import com.google.common.base.Preconditions;
 
 /**
  * @author Konstantin Pelykh ([email protected])
  * 
- * @see https://github.com/docker/docker/blob/master/api/client/commands.go
+ * @see "https://github.com/docker/docker/blob/master/api/client/commands.go"
  */
 public class DockerClientImpl implements Closeable, DockerClient {
 

diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -1,19 +1,16 @@
 package com.github.dockerjava.core;
 
+import com.github.dockerjava.api.DockerClientException;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
-
-import com.github.dockerjava.api.DockerClientException;
-
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.glassfish.jersey.SslConfigurator;
 
+import javax.net.ssl.SSLContext;
 import java.io.Serializable;
 import java.security.KeyStore;
 import java.security.Security;
 
-import javax.net.ssl.SSLContext;
-
 /**
  * SSL Config from local files.
  */
@@ -41,9 +38,6 @@ public SSLContext getSSLContext() {
 
         Security.addProvider(new BouncyCastleProvider());
 
-        KeyStore keyStore = CertificateUtils.createKeyStore(dockerCertPath);
-        KeyStore trustStore = CertificateUtils.createTrustStore(dockerCertPath);
-
         // properties acrobatics not needed for java > 1.6
         String httpProtocols = System.getProperty("https.protocols");
         System.setProperty("https.protocols", "TLSv1");
@@ -52,9 +46,9 @@ public SSLContext getSSLContext() {
           System.setProperty("https.protocols", httpProtocols);
         }
 
-        sslConfig.keyStore(keyStore);
+        sslConfig.keyStore(CertificateUtils.createKeyStore(dockerCertPath));
         sslConfig.keyStorePassword("docker");
-        sslConfig.trustStore(trustStore);
+        sslConfig.trustStore(CertificateUtils.createTrustStore(dockerCertPath));
 
         return sslConfig.createSSLContext();
 

diff --git a/src/main/java/com/github/dockerjava/core/SSLConfig.java b/src/main/java/com/github/dockerjava/core/SSLConfig.java
@@ -1,9 +1,6 @@
 package com.github.dockerjava.core;
 
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
+import java.security.*;
 
 import javax.net.ssl.SSLContext;