Update to docker-java 3.2.7 (#3577)

testcontainers · Dec 10, 2020 · c3a8ca7 · c3a8ca7
1 parent af678a3
commit c3a8ca7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -173,9 +173,9 @@ dependencies {
 
     compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
 
-    compile "com.github.docker-java:docker-java-api:3.2.6"
+    compile "com.github.docker-java:docker-java-api:3.2.7"
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.6') {
+    shaded ('com.github.docker-java:docker-java-core:3.2.7') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-api')
         exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
         exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -184,13 +184,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.6') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.7') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.6'
+    compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.7'
 
     shaded "org.yaml:snakeyaml:1.27"
 

diff --git a/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java b/core/src/main/java/org/testcontainers/dockerclient/DockerClientProviderStrategy.java
@@ -5,6 +5,7 @@
 import com.github.dockerjava.api.model.Network;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientImpl;
+import com.github.dockerjava.core.RemoteApiVersion;
 import com.github.dockerjava.okhttp.OkDockerHttpClient;
 import com.github.dockerjava.transport.DockerHttpClient;
 import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
@@ -236,9 +237,14 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
                 throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
         }
 
+        DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
+
+        if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
+            configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_30);
+        }
         return DockerClientImpl.getInstance(
             new AuthDelegatingDockerClientConfig(
-                DefaultDockerClientConfig.createDefaultConfigBuilder()
+                configBuilder
                     .withDockerHost(transportConfig.getDockerHost().toString())
                     .build()
             ),

diff --git a/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java b/core/src/test/java/org/testcontainers/containers/GenericContainerTest.java
@@ -27,7 +27,7 @@ public class GenericContainerTest {
     public void shouldReportOOMAfterWait() {
         Info info = DockerClientFactory.instance().client().infoCmd().exec();
         // Poor man's rootless Docker detection :D
-        Assumptions.assumeThat(info.getDriver()).doesNotContain("vfs");
+        Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("rootless");
         try (
             GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
                 .withStartupCheckStrategy(new NoopStartupCheckStrategy())