Merge pull request #465 from docker-java/issue-456-master

KostyaSha · KostyaSha · commit b2de61275f90 · 2016-02-14T17:10:50.000+03:00
Issue-456 input configuration should not be altered as it breaks unix…
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -69,11 +69,11 @@ public class DockerClientConfig implements Serializable {
         CONFIG_KEYS.add(REGISTRY_URL);
     }
 
-    private URI dockerHost;
+    private final URI dockerHost;
 
     private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, dockerCertPath;
 
-    private boolean dockerTlsVerify;
+    private final boolean dockerTlsVerify;
 
     private final RemoteApiVersion apiVersion;
 
@@ -238,10 +238,6 @@ public URI getDockerHost() {
         return dockerHost;
     }
 
-    public void setDockerHost(URI dockerHost) {
-        this.dockerHost = dockerHost;
-    }
-
     public RemoteApiVersion getApiVersion() {
         return apiVersion;
     }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -174,14 +174,14 @@ public void init(DockerClientConfig dockerClientConfig) {
             protocol = "http";
         }
 
-        if (originalUri.getScheme().equals("unix")) {
-            dockerClientConfig.setDockerHost(UnixConnectionSocketFactory.sanitizeUri(originalUri));
-        } else {
+        if (!originalUri.getScheme().equals("unix")) {
+
             try {
                 originalUri = new URI(originalUri.toString().replaceFirst("tcp", protocol));
             } catch (URISyntaxException e) {
                 throw new RuntimeException(e);
             }
+
             configureProxy(clientConfig, protocol);
         }
 
@@ -209,7 +209,14 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         client = clientBuilder.build();
 
-        baseResource = client.target(originalUri.toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
+        baseResource = client.target(sanitizeUrl(originalUri).toString()).path(dockerClientConfig.getApiVersion().asWebPathPart());
+    }
+
+    private URI sanitizeUrl(URI originalUri) {
+        if (originalUri.getScheme().equals("unix")) {
+            return UnixConnectionSocketFactory.sanitizeUri(originalUri);
+        }
+        return originalUri;
     }
 
     private void configureProxy(ClientConfig clientConfig, String protocol) {

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ public class DockerClientConfig implements Serializable {`
`69`	`69`	`CONFIG_KEYS.add(REGISTRY_URL);`
`70`	`70`	`}`
`71`	`71`
`72`		`- private URI dockerHost;`
	`72`	`+ private final URI dockerHost;`
`73`	`73`
`74`	`74`	`private final String registryUsername, registryPassword, registryEmail, registryUrl, dockerConfig, dockerCertPath;`
`75`	`75`
`76`		`- private boolean dockerTlsVerify;`
	`76`	`+ private final boolean dockerTlsVerify;`
`77`	`77`
`78`	`78`	`private final RemoteApiVersion apiVersion;`
`79`	`79`
`@@ -238,10 +238,6 @@ public URI getDockerHost() {`
`238`	`238`	`return dockerHost;`
`239`	`239`	`}`
`240`	`240`
`241`		`- public void setDockerHost(URI dockerHost) {`
`242`		`- this.dockerHost = dockerHost;`
`243`		`- }`
`244`		`-`
`245`	`241`	`public RemoteApiVersion getApiVersion() {`
`246`	`242`	`return apiVersion;`
`247`	`243`	`}`