docker-java · bsideup · Feb 4, 2022 · Feb 4, 2022 · Feb 4, 2022 · Feb 4, 2022
diff --git a/docker-java-transport-httpclient5/pom.xml b/docker-java-transport-httpclient5/pom.xml
@@ -39,6 +39,13 @@
 			<artifactId>jna</artifactId>
 			<version>5.8.0</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-tck</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...tpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java b/...tpclient5/src/main/java/com/github/dockerjava/httpclient5/ApacheDockerHttpClientImpl.java
@@ -51,6 +51,7 @@ class ApacheDockerHttpClientImpl implements DockerHttpClient {
 
     private final CloseableHttpClient httpClient;
     private final HttpHost host;
+    private final String pathPrefix;
 
     protected ApacheDockerHttpClientImpl(
         URI dockerHost,
@@ -64,16 +65,22 @@ protected ApacheDockerHttpClientImpl(
         switch (dockerHost.getScheme()) {
             case "unix":
             case "npipe":
+                pathPrefix = "";
                 host = new HttpHost(dockerHost.getScheme(), "localhost", 2375);
                 break;
             case "tcp":
+                String rawPath = dockerHost.getRawPath();
+                pathPrefix = rawPath.endsWith("/")
+                    ? rawPath.substring(0, rawPath.length() - 1)
+                    : rawPath;
                 host = new HttpHost(
                     socketFactoryRegistry.lookup("https") != null ? "https" : "http",
                     dockerHost.getHost(),
                     dockerHost.getPort()
                 );
                 break;
             default:
+                pathPrefix = "";
                 host = HttpHost.create(dockerHost);
         }
 
@@ -159,7 +166,7 @@ public Socket createSocket(HttpContext context) {
     @Override
     public Response execute(Request request) {
         HttpContext context = new BasicHttpContext();
-        HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(request.path()));
+        HttpUriRequestBase httpUriRequest = new HttpUriRequestBase(request.method(), URI.create(pathPrefix + request.path()));
         httpUriRequest.setScheme(host.getSchemeName());
         httpUriRequest.setAuthority(new URIAuthority(host.getHostName(), host.getPort()));
 

diff --git a/...transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java b/...transport-httpclient5/src/test/java/com/github/dockerjava/transport/HttpClient5Tests.java
@@ -0,0 +1,16 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
+
+import java.net.URI;
+
+public class HttpClient5Tests extends DockerHttpClientTCK {
+
+    @Override
+    protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        return new ApacheDockerHttpClient.Builder()
+            .dockerHost(dockerHost)
+            .sslConfig(sslConfig)
+            .build();
+    }
+}
diff --git a/docker-java-transport-jersey/pom.xml b/docker-java-transport-jersey/pom.xml
@@ -68,6 +68,20 @@
 			<artifactId>junixsocket-native-common</artifactId>
 			<version>${junixsocket.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.7.30</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-tck</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java b/docker-java-transport-jersey/src/test/java/com/github/dockerjava/transport/JerseyTests.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.jaxrs.JerseyDockerHttpClient;
+
+import java.net.URI;
+
+public class JerseyTests extends DockerHttpClientTCK {
+
+    @Override
+    protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        return new JerseyDockerHttpClient.Builder()
+            .dockerHost(dockerHost)
+            .sslConfig(sslConfig)
+            .connectTimeout(30 * 1000)
+            .build();
+    }
+}
diff --git a/docker-java-transport-okhttp/pom.xml b/docker-java-transport-okhttp/pom.xml
@@ -33,6 +33,13 @@
 			<artifactId>jna-platform</artifactId>
 			<version>5.8.0</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport-tck</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/...-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java b/...-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/OkDockerHttpClient.java
@@ -169,6 +169,10 @@ private OkDockerHttpClient(
                     .scheme(isSSL ? "https" : "http")
                     .host(dockerHost.getHost())
                     .port(dockerHost.getPort());
+
+                if (dockerHost.getPath().length() > 0) {
+                    baseUrlBuilder = baseUrlBuilder.encodedPath(dockerHost.getPath());
+                }
                 break;
             default:
                 baseUrlBuilder = HttpUrl.get(dockerHost.toString()).newBuilder();

diff --git a/...ava-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java b/...ava-transport-okhttp/src/test/java/com/github/dockerjava/transport/OkHttpClientTests.java
@@ -0,0 +1,17 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.okhttp.OkDockerHttpClient;
+
+import java.net.URI;
+
+public class OkHttpClientTests extends DockerHttpClientTCK {
+
+    @Override
+    protected DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig) {
+        return new OkDockerHttpClient.Builder()
+            .dockerHost(dockerHost)
+            .sslConfig(sslConfig)
+            .connectTimeout(30 * 100)
+            .build();
+    }
+}
diff --git a/docker-java-transport-tck/pom.xml b/docker-java-transport-tck/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>com.github.docker-java</groupId>
+		<artifactId>docker-java-parent</artifactId>
+		<version>0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>docker-java-transport-tck</artifactId>
+	<packaging>jar</packaging>
+
+	<name>docker-java-transport-tck</name>
+	<url>https://github.com/docker-java/docker-java</url>
+	<description>Java API Client for Docker</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>docker-java-transport</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.22.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>mockwebserver</artifactId>
+			<version>3.14.9</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/...java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java b/...java-transport-tck/src/main/java/com/github/dockerjava/transport/DockerHttpClientTCK.java
@@ -0,0 +1,55 @@
+package com.github.dockerjava.transport;
+
+import com.github.dockerjava.transport.DockerHttpClient.Request;
+import com.github.dockerjava.transport.DockerHttpClient.Request.Method;
+import com.github.dockerjava.transport.DockerHttpClient.Response;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import org.junit.Test;
+
+import java.net.URI;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public abstract class DockerHttpClientTCK {
+
+    protected abstract DockerHttpClient createDockerHttpClient(URI dockerHost, SSLConfig sslConfig);
+
+    /**
+     * Test that docker-java supports path in DOCKER_HOST
+     *
+     * @see <a href="https://github.com/moby/moby/blob/7b9275c0da707b030e62c96b679a976f31f929d3/opts/hosts_test.go#L64">valid values</a>
+     */
+    @Test
+    public final void testPath() throws Exception {
+        try (MockWebServer server = new MockWebServer()) {
+            String dockerHost = server.url("/%20some/path/").toString()
+                .replace("http://", "tcp://");
+
+            try (DockerHttpClient client = createDockerHttpClient(dockerHost)) {
+                server.enqueue(new MockResponse().setResponseCode(200));
+                ping(client);
+                assertThat(server.takeRequest().getPath())
+                    .as("recorded path")
+                    .isEqualTo("/%20some/path/_ping");
+            }
+        }
+    }
+
+    private DockerHttpClient createDockerHttpClient(String dockerHost) {
+        return createDockerHttpClient(URI.create(dockerHost), null);
+    }
+
+    private void ping(DockerHttpClient client) {
+        Request pingRequest = Request.builder()
+            .method(Method.GET)
+            .path("/_ping")
+            .build();
+
+        try (Response response = client.execute(pingRequest)) {
+            assertThat(response.getStatusCode())
+                .as("status code")
+                .isEqualTo(200);
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
@@ -96,6 +96,7 @@
 		<module>docker-java-bom</module>
 		<module>docker-java-core</module>
 		<module>docker-java-transport</module>
+		<module>docker-java-transport-tck</module>
 		<module>docker-java-transport-netty</module>
 		<module>docker-java-transport-jersey</module>
 		<module>docker-java-transport-okhttp</module>