Merge pull request #963 from bmuschko/bm/remove-netty

Remove Netty exec factory support
bmuschko · Aug 22, 2020 · 3736ff6 · 3736ff6
2 parents 368159b + 633a3e0
commit 3736ff6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 89 deletions.
diff --git a/...st/groovy/com/bmuschko/gradle/docker/DockerNettyDockerCmdExecFactoryFunctionalTest.groovy b/...st/groovy/com/bmuschko/gradle/docker/DockerNettyDockerCmdExecFactoryFunctionalTest.groovy
diff --git a/src/main/groovy/com/bmuschko/gradle/docker/tasks/AbstractDockerRemoteApiTask.groovy b/src/main/groovy/com/bmuschko/gradle/docker/tasks/AbstractDockerRemoteApiTask.groovy
@@ -23,7 +23,6 @@ import com.github.dockerjava.core.DefaultDockerClientConfig
 import com.github.dockerjava.core.DockerClientBuilder
 import com.github.dockerjava.core.DockerClientConfig
 import com.github.dockerjava.httpclient5.ApacheDockerHttpClient
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory
 import groovy.transform.CompileStatic
 import groovy.transform.Memoized
 import org.gradle.api.Action
@@ -166,29 +165,14 @@ abstract class AbstractDockerRemoteApiTask extends DefaultTask {
 
         DefaultDockerClientConfig dockerClientConfig = dockerClientConfigBuilder.build()
 
-        DockerClient dockerClient = buildDockerClient(dockerClientConfig)
+        DockerClient dockerClient = createDefaultDockerClient(dockerClientConfig)
         // register buildFinished-hook to close docker client.
         project.gradle.buildFinished {
             dockerClient.close()
         }
         dockerClient
     }
 
-    private DockerClient buildDockerClient(DockerClientConfig config) {
-        boolean useNettyExecFactory = Boolean.valueOf(getProject().findProperty('gdpNettyExecFactory')?.toString())
-            ?: Boolean.valueOf(System.getProperty('gdp.netty.exec.factory'))
-            ?: Boolean.valueOf(System.getenv('GDP_NETTY_EXEC_FACTORY'))
-
-        if (useNettyExecFactory) {
-            logger.debug("Using " + NettyDockerCmdExecFactory.class.simpleName + " as driver for " + DockerClient.class.simpleName)
-            return DockerClientBuilder.getInstance(config)
-                    .withDockerCmdExecFactory(new NettyDockerCmdExecFactory())
-                    .build()
-        }
-
-        createDefaultDockerClient(config)
-    }
-
     private DockerClient createDefaultDockerClient(DockerClientConfig config) {
         ApacheDockerHttpClient dockerClient = new ApacheDockerHttpClient.Builder()
                 .dockerHost(config.getDockerHost())