Skip to content

Commit 58119ed

Browse files
authored
Set default docker API version to 1.44 (#11216)
Fixes #11212
1 parent ab25486 commit 58119ed

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
404404
DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
405405

406406
if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
407-
configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_32);
407+
configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_44);
408408
}
409409
Map<String, String> headers = new HashMap<>();
410410
headers.put("x-tc-sid", DockerClientFactory.SESSION_ID);

core/src/test/java/org/testcontainers/junit/ComposeContainerWithBuildTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.testcontainers.utility.DockerImageName;
1111

1212
import java.io.File;
13+
import java.util.Collections;
1314
import java.util.concurrent.TimeUnit;
1415
import java.util.concurrent.atomic.AtomicReference;
1516
import java.util.stream.Stream;
@@ -97,7 +98,7 @@ private boolean isImagePresent(final String imageName) {
9798
.instance()
9899
.client()
99100
.listImagesCmd()
100-
.withImageNameFilter(imageName)
101+
.withFilter("reference", Collections.singletonList(imageName))
101102
.exec()
102103
.stream()
103104
.findFirst()

core/src/test/java/org/testcontainers/junit/DockerComposeContainerWithBuildTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.testcontainers.utility.DockerImageName;
1111

1212
import java.io.File;
13+
import java.util.Collections;
1314
import java.util.concurrent.TimeUnit;
1415
import java.util.concurrent.atomic.AtomicReference;
1516
import java.util.stream.Stream;
@@ -102,7 +103,7 @@ private boolean isImagePresent(final String imageName) {
102103
.instance()
103104
.client()
104105
.listImagesCmd()
105-
.withImageNameFilter(imageName)
106+
.withFilter("reference", Collections.singletonList(imageName))
106107
.exec()
107108
.stream()
108109
.findFirst()

0 commit comments

Comments
 (0)