From ee51f0702ea76f0278dab21b5f49f4120b907291 Mon Sep 17 00:00:00 2001 From: Logan O'Sullivan Bruns Date: Wed, 17 Aug 2016 14:59:12 -0700 Subject: [PATCH] Issue 674: 3.0.x switch from docker host using https|http scheme to tcp breaks proxy configure https://github.com/docker-java/docker-java/issues/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. --- .../github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java index 3339a2696..0f4473e76 100644 --- a/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java +++ b/src/main/java/com/github/dockerjava/jaxrs/JerseyDockerCmdExecFactory.java @@ -187,7 +187,7 @@ public void init(DockerClientConfig dockerClientConfig) { throw new RuntimeException(e); } - configureProxy(clientConfig, protocol); + configureProxy(clientConfig, originalUri, protocol); } connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry( @@ -237,9 +237,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 proxies = ProxySelector.getDefault().select(dockerClientConfig.getDockerHost()); + List proxies = ProxySelector.getDefault().select(originalUri); for (Proxy proxy : proxies) { InetSocketAddress address = (InetSocketAddress) proxy.address();