From 05025da9e4d748bbfc35f7d8ea9179f1a6afd006 Mon Sep 17 00:00:00 2001 From: Ruben Rodrigues Date: Wed, 17 Jul 2024 21:51:28 +0200 Subject: [PATCH] Replace NettyDockerCmdExecFactory for OkHttpDockerCmdExecFactory to support npipe protocol for windows docker --- .../org/jfrog/build/extractor/docker/DockerJavaWrapper.java | 4 ++-- build.gradle | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerJavaWrapper.java b/build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerJavaWrapper.java index 62acae273..be8eb8e6c 100644 --- a/build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerJavaWrapper.java +++ b/build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerJavaWrapper.java @@ -10,7 +10,7 @@ import com.github.dockerjava.core.command.BuildImageResultCallback; import com.github.dockerjava.core.command.PullImageResultCallback; import com.github.dockerjava.core.command.PushImageResultCallback; -import com.github.dockerjava.netty.NettyDockerCmdExecFactory; +import com.github.dockerjava.okhttp.OkHttpDockerCmdExecFactory; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.jfrog.build.api.util.Log; @@ -74,7 +74,7 @@ public static DockerClient getDockerClient(String host, Map envV } DockerClientConfig config = configBuilder.build(); - return DockerClientBuilder.getInstance(config).withDockerCmdExecFactory(new NettyDockerCmdExecFactory()).build(); + return DockerClientBuilder.getInstance(config).withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory()).build(); } /** diff --git a/build.gradle b/build.gradle index 8ab75ceab..44f977e47 100644 --- a/build.gradle +++ b/build.gradle @@ -472,6 +472,7 @@ project('build-info-extractor-docker') { implementation(group: 'com.github.docker-java', name: 'docker-java', version: dockerJavaVersion) { exclude group: 'org.glassfish.jersey.core', module: 'jersey-common' } + implementation(group: 'com.github.docker-java', name: 'docker-java-transport-okhttp', version: dockerJavaVersion) implementation group: 'org.glassfish.jersey.core', name: 'jersey-common', version: jerseyVersion } }