GeezerVison is showing github.com — Append the API version to all requests if set (#1514) · lreimer/docker-java@c60bcb2
File tree
Expand file treeCollapse file tree
Open diff view settings
docker-java-core/src/main/java/com/github/dockerjava/core docker-java/src/test/java/com/github/dockerjava/core
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: docker-java-core/src/main/java/com/github/dockerjava/core/DefaultDockerCmdExecFactory.java +5Lines changed: 5 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -79,6 +79,11 @@ public InvocationBuilder request() { |
79 | 79 | resource = "/" + resource; |
80 | 80 | } |
81 | 81 |
|
| 82 | + RemoteApiVersion apiVersion = getDockerClientConfig().getApiVersion(); |
| 83 | + if (apiVersion != RemoteApiVersion.UNKNOWN_VERSION) { |
| 84 | + resource = "/" + apiVersion.asWebPathPart() + resource; |
| 85 | + } |
| 86 | + |
82 | 87 | if (!queryParams.isEmpty()) { |
83 | 88 | Escaper urlFormParameterEscaper = UrlEscapers.urlFormParameterEscaper(); |
84 | 89 | resource = queryParams.asMap().entrySet().stream() |
|
Collapse file
Copy file name to clipboardExpand all lines: docker-java/src/test/java/com/github/dockerjava/core/DockerRule.java +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -178,6 +178,7 @@ private static DefaultDockerClientConfig config() { |
178 | 178 |
|
179 | 179 | public static DefaultDockerClientConfig config(String password) { |
180 | 180 | DefaultDockerClientConfig.Builder builder = DefaultDockerClientConfig.createDefaultConfigBuilder() |
| 181 | + .withApiVersion(RemoteApiVersion.VERSION_1_30) |
181 | 182 | .withRegistryUrl("https://index.docker.io/v1/"); |
182 | 183 | if (password != null) { |
183 | 184 | builder = builder.withRegistryPassword(password); |
|