From a0e7d7f3d0cccef7e7055aada78742c8236bd429 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 10 Dec 2020 10:42:19 +0100 Subject: [PATCH 1/2] Append the API version to all requests if set --- .../github/dockerjava/core/DefaultDockerCmdExecFactory.java | 5 +++++ .../src/test/java/com/github/dockerjava/core/DockerRule.java | 1 + 2 files changed, 6 insertions(+) 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 index 75e27c365..5376997bc 100644 --- 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 index e6e922bc6..a2661358f 100644 --- 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_40) .withRegistryUrl("https://index.docker.io/v1/"); if (password != null) { builder = builder.withRegistryPassword(password); From 41694c76a4a8622fa271e934812e1cf975f30105 Mon Sep 17 00:00:00 2001 From: Sergei Egorov Date: Thu, 10 Dec 2020 11:26:48 +0100 Subject: [PATCH 2/2] Use older API version --- .../src/test/java/com/github/dockerjava/core/DockerRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index a2661358f..6b137485f 100644 --- 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,7 +178,7 @@ private static DefaultDockerClientConfig config() { public static DefaultDockerClientConfig config(String password) { DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder() - .withApiVersion(RemoteApiVersion.VERSION_1_40) + .withApiVersion(RemoteApiVersion.VERSION_1_30) .withRegistryUrl("https://index.docker.io/v1/"); if (password != null) { builder = builder.withRegistryPassword(password);