Skip to content

Commit bbd18a6

Browse files
committed
Replace netty with Apache httpclient
1 parent 2a5003d commit bbd18a6

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

build-info-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerJavaWrapper.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import com.github.dockerjava.api.command.BuildImageCmd;
55
import com.github.dockerjava.api.command.InspectImageResponse;
66
import com.github.dockerjava.api.model.AuthConfig;
7-
import com.github.dockerjava.core.DefaultDockerClientConfig;
87
import com.github.dockerjava.core.DockerClientBuilder;
98
import com.github.dockerjava.core.DockerClientConfig;
9+
import com.github.dockerjava.core.DefaultDockerClientConfig;
1010
import com.github.dockerjava.core.command.BuildImageResultCallback;
1111
import com.github.dockerjava.core.command.PullImageResultCallback;
1212
import com.github.dockerjava.core.command.PushImageResultCallback;
13-
import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
13+
import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
14+
import com.github.dockerjava.transport.DockerHttpClient;
1415
import org.apache.commons.lang3.StringUtils;
1516
import org.apache.commons.lang3.tuple.Pair;
1617
import org.jfrog.build.api.util.Log;
@@ -74,7 +75,12 @@ public static DockerClient getDockerClient(String host, Map<String, String> envV
7475
}
7576

7677
DockerClientConfig config = configBuilder.build();
77-
return DockerClientBuilder.getInstance(config).withDockerCmdExecFactory(new NettyDockerCmdExecFactory()).build();
78+
79+
DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
80+
.dockerHost(config.getDockerHost())
81+
.sslConfig(config.getSSLConfig())
82+
.build();
83+
return DockerClientBuilder.getInstance(config).withDockerHttpClient(httpClient).build();
7884
}
7985

8086
/**

build-info-extractor-docker/src/test/java/org/jfrog/build/extractor/docker/extractor/DockerExtractorTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.jfrog.build.api.multiMap.ListMultimap;
1111
import org.jfrog.build.api.multiMap.Multimap;
1212
import org.jfrog.build.extractor.ci.*;
13+
import org.jfrog.build.extractor.ci.Module;
1314
import org.jfrog.build.extractor.docker.DockerJavaWrapper;
1415
import org.jfrog.build.extractor.executor.CommandExecutor;
1516
import org.jfrog.build.extractor.executor.CommandResults;

build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ project('build-info-extractor-docker') {
472472
implementation(group: 'com.github.docker-java', name: 'docker-java', version: dockerJavaVersion) {
473473
exclude group: 'org.glassfish.jersey.core', module: 'jersey-common'
474474
}
475+
implementation group: 'com.github.docker-java', name: 'docker-java-transport-httpclient5', version: dockerJavaVersion
475476
implementation group: 'org.glassfish.jersey.core', name: 'jersey-common', version: jerseyVersion
476477
}
477478
}

0 commit comments

Comments
 (0)