Merge branch '2.x'

Marcus Linke · Marcus Linke · commit 8d714ad1c9f5 · 2015-12-08T20:14:50.000+01:00
Conflicts:
	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All changes
  
 * [#392] (https://github.com/docker-java/docker-java/pull/392) Introduce InspectContainerResponse.Mounts
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
+* [#386] (https://github.com/docker-java/docker-java/pull/386) Basic http proxy configuration support
 * [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
 * [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
 * [#357] (https://github.com/docker-java/docker-java/pull/357) Wait container command needs possibility to abort operation
@@ -19,7 +20,8 @@ All changes
 2.1.3-SNAPSHOT
 ---
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
-* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21) 
+* [#386] (https://github.com/docker-java/docker-java/pull/386) Basic http proxy configuration support
+* [#362] (https://github.com/docker-java/docker-java/pull/362) Deprecate "network" and enable "networks" stats (remote Docker API 1.21)
 
 v2.1.2
 ---
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -44,6 +44,7 @@
 import com.github.dockerjava.jaxrs.filter.JsonClientFilter;
 import com.github.dockerjava.jaxrs.filter.ResponseStatusExceptionFilter;
 import com.github.dockerjava.jaxrs.filter.SelectiveLoggingFilter;
+
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.socket.PlainConnectionSocketFactory;
@@ -62,8 +63,13 @@
 import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.client.WebTarget;
+
 import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.ProxySelector;
 import java.net.URI;
+import java.util.List;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -95,6 +101,7 @@ public class DockerCmdExecFactoryImpl implements DockerCmdExecFactory {
     @Override
     public void init(DockerClientConfig dockerClientConfig) {
         checkNotNull(dockerClientConfig, "config was not specified");
+        this.dockerClientConfig = dockerClientConfig;
 
         ClientConfig clientConfig = new ClientConfig();
         clientConfig.connectorProvider(new ApacheConnectorProvider());
@@ -134,11 +141,14 @@ public void init(DockerClientConfig dockerClientConfig) {
         SSLContext sslContext = null;
 
         if (dockerClientConfig.getSslConfig() != null) {
+            configureProxy(clientConfig, "https");
             try {
                 sslContext = dockerClientConfig.getSslConfig().getSSLContext();
             } catch (Exception ex) {
                 throw new DockerClientException("Error in SSL Configuration", ex);
             }
+        } else {
+            configureProxy(clientConfig, "http");
         }
 
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
@@ -169,7 +179,30 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
 
-        this.dockerClientConfig = dockerClientConfig;
+    }
+
+    private void configureProxy(ClientConfig clientConfig, String protocol) {
+
+        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getUri());
+
+        for (Proxy proxy : proxies) {
+            InetSocketAddress address = (InetSocketAddress) proxy.address();
+            if (address != null) {
+                String hostname = address.getHostName();
+                int port = address.getPort();
+
+                clientConfig.property(ClientProperties.PROXY_URI, protocol + "://" + hostname + ":" + port);
+
+                String httpProxyUser = System.getProperty(protocol + ".proxyUser");
+                if (httpProxyUser != null) {
+                    clientConfig.property(ClientProperties.PROXY_USERNAME, httpProxyUser);
+                    String httpProxyPassword = System.getProperty(protocol + ".proxyPassword");
+                    if (httpProxyPassword != null) {
+                        clientConfig.property(ClientProperties.PROXY_PASSWORD, httpProxyPassword);
+                    }
+                }
+            }
+        }
     }
 
     private org.apache.http.config.Registry<ConnectionSocketFactory> getSchemeRegistry(final URI originalUri,
