Issue 674: 3.0.x switch from docker host using https|http scheme to tcp breaks proxy configure (#675)

loganbruns · marcuslinke · commit 5b8ed07cfbbd · 2017-01-13T23:09:13.000+01:00
#674 With the 3.0.x release, the code has been changed to use docker hosts of the format: tcp://host:port Instead of: https://host:port This breaks some of the logic in JerseyDockerCmdExecFactory that configures the proxy setting.
diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java
@@ -190,7 +190,7 @@ public void init(DockerClientConfig dockerClientConfig) {
                 throw new RuntimeException(e);
             }
 
-            configureProxy(clientConfig, protocol);
+            configureProxy(clientConfig, originalUri, protocol);
         }
 
         connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
@@ -241,9 +241,9 @@ private URI sanitizeUrl(URI originalUri) {
         return originalUri;
     }
 
-    private void configureProxy(ClientConfig clientConfig, String protocol) {
+    private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) {
 
-        List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getDockerHost());
+        List<Proxy> proxies = ProxySelector.getDefault().select(originalUri);
 
         for (Proxy proxy : proxies) {
             InetSocketAddress address = (InetSocketAddress) proxy.address();

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ public void init(DockerClientConfig dockerClientConfig) {`
`190`	`190`	`throw new RuntimeException(e);`
`191`	`191`	`}`
`192`	`192`
`193`		`- configureProxy(clientConfig, protocol);`
	`193`	`+ configureProxy(clientConfig, originalUri, protocol);`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(`
`@@ -241,9 +241,9 @@ private URI sanitizeUrl(URI originalUri) {`
`241`	`241`	`return originalUri;`
`242`	`242`	`}`
`243`	`243`
`244`		`- private void configureProxy(ClientConfig clientConfig, String protocol) {`
	`244`	`+ private void configureProxy(ClientConfig clientConfig, URI originalUri, String protocol) {`
`245`	`245`
`246`		`- List<Proxy> proxies = ProxySelector.getDefault().select(dockerClientConfig.getDockerHost());`
	`246`	`+ List<Proxy> proxies = ProxySelector.getDefault().select(originalUri);`
`247`	`247`
`248`	`248`	`for (Proxy proxy : proxies) {`
`249`	`249`	`InetSocketAddress address = (InetSocketAddress) proxy.address();`