Append the API version to all requests if set (docker-java#1514)

bsideup · web-flow · commit c60bcb2882e5 · 2020-12-10T12:28:44.000+01:00
* Append the API version to all requests if set

* Use older API version
diff --git a/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java b/docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java
@@ -79,6 +79,11 @@ public InvocationBuilder request() {
                 resource = "/" + resource;
             }
 
+            RemoteApiVersion apiVersion = getDockerClientConfig().getApiVersion();
+            if (apiVersion != RemoteApiVersion.UNKNOWN_VERSION) {
+                resource = "/" + apiVersion.asWebPathPart() + resource;
+            }
+
             if (!queryParams.isEmpty()) {
                 Escaper urlFormParameterEscaper = UrlEscapers.urlFormParameterEscaper();
                 resource = queryParams.asMap().entrySet().stream()
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java b/docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java
@@ -178,6 +178,7 @@ private static DefaultDockerClientConfig config() {
 
     public static DefaultDockerClientConfig config(String password) {
         DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder()
+                .withApiVersion(RemoteApiVersion.VERSION_1_30)
                 .withRegistryUrl("https://index.docker.io/v1/");
         if (password != null) {
             builder = builder.withRegistryPassword(password);
