Merge remote-tracking branch 'origin/2.x'

Marcus Linke · Marcus Linke · commit 8fe6943a0843 · 2015-12-15T21:22:45.000+01:00
Conflicts:
	CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ Notes
 * The upcoming release will contain multiple API breaking changes therefore the major version switch. It will supports a subset of v.1.21 of the docker remote API.
 
 All changes
+
+* [#396] (https://github.com/docker-java/docker-java/pull/396) Disable evaluation of http.proxy... variables when using unix socket connection 
 * [#393] (https://github.com/docker-java/docker-java/pull/392) Support ONBUILD instruction in Dockerfiles 
 * [#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
@@ -18,6 +20,12 @@ All changes
 * [#347] (https://github.com/docker-java/docker-java/pull/347) Implementation of copy archive to/from container commands 
 * [#313] (https://github.com/docker-java/docker-java/pull/313) Refactor primitive type fields to be of object type in JSON objects
 
+2.1.4-SNAPSHOT
+---
+
+* [#396] (https://github.com/docker-java/docker-java/pull/396) Disable evaluation of http.proxy... variables when using unix socket connection  
+* [#359] (https://github.com/docker-java/docker-java/pull/359) Fix performance issue of build command by adding bulk-read variant of InputStream.read()
+
 v2.1.3
 ---
 * [#387] (https://github.com/docker-java/docker-java/pull/387) Make ProgressDetails attributes public
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -147,7 +147,7 @@ public int read() throws IOException {
                     }
 
                     @Override
-                    public int read(byte[] buff, int offset, int len) throws IOException {
+                    public int read(byte [] buff, int offset, int len) throws IOException {
                         return tarInputStream.read(buff, offset, len);
                     }
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -141,16 +141,23 @@ public void init(DockerClientConfig dockerClientConfig) {
         URI originalUri = dockerClientConfig.getUri();
 
         SSLContext sslContext = null;
+        String protocol = null;
 
         if (dockerClientConfig.getSslConfig() != null) {
-            configureProxy(clientConfig, "https");
+            protocol = "https";
             try {
                 sslContext = dockerClientConfig.getSslConfig().getSSLContext();
             } catch (Exception ex) {
                 throw new DockerClientException("Error in SSL Configuration", ex);
             }
         } else {
-            configureProxy(clientConfig, "http");
+            protocol = "http";
+        }
+
+        if(originalUri.getScheme().equals("unix")) {
+            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
+        } else {
+            configureProxy(clientConfig, protocol);
         }
 
         PoolingHttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(getSchemeRegistry(
@@ -175,12 +182,7 @@ public void init(DockerClientConfig dockerClientConfig) {
 
         client = clientBuilder.build();
 
-        if (originalUri.getScheme().equals("unix")) {
-            dockerClientConfig.setUri(UnixConnectionSocketFactory.sanitizeUri(originalUri));
-        }
-
         baseResource = client.target(dockerClientConfig.getUri()).path(dockerClientConfig.getVersion().asWebPathPart());
-
     }
 
     private void configureProxy(ClientConfig clientConfig, String protocol) {

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public int read() throws IOException {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`@Override`
`150`		`- public int read(byte[] buff, int offset, int len) throws IOException {`
	`150`	`+ public int read(byte [] buff, int offset, int len) throws IOException {`
`151`	`151`	`return tarInputStream.read(buff, offset, len);`
`152`	`152`	`}`
`153`	`153`