Update to docker-java 3.2.12 (#4459)

* Try `docker-java` 3.2.12 * use shaded configuration * Update build.gradle
testcontainers · Sep 15, 2021 · 5e88d74 · 5e88d74
1 parent 79b064b
commit 5e88d74
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 33 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -77,9 +77,11 @@ dependencies {
 
     shaded 'org.awaitility:awaitility:4.1.0'
 
-    api "com.github.docker-java:docker-java-api:3.2.11"
+    shaded platform('com.github.docker-java:docker-java-bom:3.2.12')
 
-    shaded ('com.github.docker-java:docker-java-core:3.2.11') {
+    api "com.github.docker-java:docker-java-api"
+
+    shaded ('com.github.docker-java:docker-java-core') {
         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')
@@ -88,13 +90,13 @@ dependencies {
         exclude(group: 'org.apache.commons', module: 'commons-compress')
     }
 
-    shaded ('com.github.docker-java:docker-java-transport-okhttp:3.2.11') {
+    shaded ('com.github.docker-java:docker-java-transport-okhttp') {
         exclude(group: 'com.github.docker-java', module: 'docker-java-core')
         exclude(group: 'net.java.dev.jna')
         exclude(group: 'org.slf4j')
     }
 
-    api 'com.github.docker-java:docker-java-transport-zerodep:3.2.11'
+    api 'com.github.docker-java:docker-java-transport-zerodep'
 
     shaded "org.yaml:snakeyaml:1.29"
 

diff --git a/core/src/main/java/org/testcontainers/DockerClientFactory.java b/core/src/main/java/org/testcontainers/DockerClientFactory.java
@@ -1,6 +1,7 @@
 package org.testcontainers;
 
 import com.github.dockerjava.api.DockerClient;
+import com.github.dockerjava.api.DockerClientDelegate;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.command.CreateContainerCmd;
 import com.github.dockerjava.api.command.PullImageCmd;
@@ -94,7 +95,17 @@ public class DockerClientFactory {
     }
 
     public static DockerClient lazyClient() {
-        return LazyDockerClient.INSTANCE;
+        return new DockerClientDelegate() {
+            @Override
+            protected DockerClient getDockerClient() {
+                return instance().client();
+            }
+
+            @Override
+            public String toString() {
+                return "LazyDockerClient";
+            }
+        };
     }
 
     /**
@@ -177,7 +188,11 @@ public DockerClient client() {
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
 
         log.info("Docker host IP address is {}", strategy.getDockerHostIpAddress());
-        final DockerClient client = new DelegatingDockerClient(strategy.getDockerClient()) {
+        final DockerClient client = new DockerClientDelegate() {
+
+            @Getter
+            final DockerClient dockerClient = strategy.getDockerClient();
+
             @Override
             public void close() {
                 throw new IllegalStateException("You should never close the global DockerClient!");

diff --git a/core/src/main/java/org/testcontainers/LazyDockerClient.java b/core/src/main/java/org/testcontainers/LazyDockerClient.java
diff --git a/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java b/core/src/main/java/org/testcontainers/dockerclient/AuthDelegatingDockerClientConfig.java
@@ -2,7 +2,7 @@
 
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.core.DockerClientConfig;
-import lombok.experimental.Delegate;
+import com.github.dockerjava.core.DockerClientConfigDelegate;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.RegistryAuthLocator;
@@ -18,20 +18,18 @@
  * TODO move to docker-java
  */
 @Slf4j
-class AuthDelegatingDockerClientConfig implements DockerClientConfig {
-
-    @Delegate(excludes = DelegateExclusions.class)
-    private DockerClientConfig delegate;
+class AuthDelegatingDockerClientConfig extends DockerClientConfigDelegate {
 
     public AuthDelegatingDockerClientConfig(DockerClientConfig delegate) {
-        this.delegate = delegate;
+        super(delegate);
     }
 
+    @Override
     public AuthConfig effectiveAuthConfig(String imageName) {
         // allow docker-java auth config to be used as a fallback
         AuthConfig fallbackAuthConfig;
         try {
-            fallbackAuthConfig = delegate.effectiveAuthConfig(imageName);
+            fallbackAuthConfig = super.effectiveAuthConfig(imageName);
         } catch (Exception e) {
             log.debug("Delegate call to effectiveAuthConfig failed with cause: '{}'. " +
                 "Resolution of auth config will continue using RegistryAuthLocator.",
@@ -47,8 +45,4 @@ public AuthConfig effectiveAuthConfig(String imageName) {
         log.debug("Effective auth config [{}]", toSafeString(effectiveAuthConfig));
         return effectiveAuthConfig;
     }
-
-    private interface DelegateExclusions {
-        AuthConfig effectiveAuthConfig(String imageName);
-    }
 }