Skip to content

Commit c3a8ca7

Browse files
authored
Update to docker-java 3.2.7 (#3577)
1 parent af678a3 commit c3a8ca7

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

core/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ dependencies {
173173

174174
compile 'org.rnorth.visible-assertions:visible-assertions:2.1.2'
175175

176-
compile "com.github.docker-java:docker-java-api:3.2.6"
176+
compile "com.github.docker-java:docker-java-api:3.2.7"
177177

178-
shaded ('com.github.docker-java:docker-java-core:3.2.6') {
178+
shaded ('com.github.docker-java:docker-java-core:3.2.7') {
179179
exclude(group: 'com.github.docker-java', module: 'docker-java-api')
180180
exclude(group: 'com.github.docker-java', module: 'docker-java-transport')
181181
exclude(group: 'com.fasterxml.jackson.core', module: 'jackson-annotations')
@@ -184,13 +184,13 @@ dependencies {
184184
exclude(group: 'org.apache.commons', module: 'commons-compress')
185185
}
186186

187-
shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.6') {
187+
shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.7') {
188188
exclude(group: 'com.github.docker-java', module: 'docker-java-core')
189189
exclude(group: 'net.java.dev.jna')
190190
exclude(group: 'org.slf4j')
191191
}
192192

193-
compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.6'
193+
compile 'com.github.docker-java:docker-java-transport-zerodep:3.2.7'
194194

195195
shaded "org.yaml:snakeyaml:1.27"
196196

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.github.dockerjava.api.model.Network;
66
import com.github.dockerjava.core.DefaultDockerClientConfig;
77
import com.github.dockerjava.core.DockerClientImpl;
8+
import com.github.dockerjava.core.RemoteApiVersion;
89
import com.github.dockerjava.okhttp.OkDockerHttpClient;
910
import com.github.dockerjava.transport.DockerHttpClient;
1011
import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
@@ -236,9 +237,14 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
236237
throw new IllegalArgumentException("Unknown transport type '" + transportType + "'");
237238
}
238239

240+
DefaultDockerClientConfig.Builder configBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
241+
242+
if (configBuilder.build().getApiVersion() == RemoteApiVersion.UNKNOWN_VERSION) {
243+
configBuilder.withApiVersion(RemoteApiVersion.VERSION_1_30);
244+
}
239245
return DockerClientImpl.getInstance(
240246
new AuthDelegatingDockerClientConfig(
241-
DefaultDockerClientConfig.createDefaultConfigBuilder()
247+
configBuilder
242248
.withDockerHost(transportConfig.getDockerHost().toString())
243249
.build()
244250
),

core/src/test/java/org/testcontainers/containers/GenericContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class GenericContainerTest {
2727
public void shouldReportOOMAfterWait() {
2828
Info info = DockerClientFactory.instance().client().infoCmd().exec();
2929
// Poor man's rootless Docker detection :D
30-
Assumptions.assumeThat(info.getDriver()).doesNotContain("vfs");
30+
Assumptions.assumeThat(info.getSecurityOptions()).doesNotContain("rootless");
3131
try (
3232
GenericContainer<?> container = new GenericContainer<>(TestImages.TINY_IMAGE)
3333
.withStartupCheckStrategy(new NoopStartupCheckStrategy())

0 commit comments

Comments
 (0)