Skip to content

Replace NettyDockerCmdExecFactory for OkHttpDockerCmdExecFactory #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ru13en wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace NettyDockerCmdExecFactory for OkHttpDockerCmdExecFactory #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...fo-extractor-docker/src/main/java/org/jfrog/build/extractor/docker/DockerJavaWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -74,7 +74,7 @@ public static DockerClient getDockerClient(String host, Map<String, String> envV
}

DockerClientConfig config = configBuilder.build();
return DockerClientBuilder.getInstance(config).withDockerCmdExecFactory(new NettyDockerCmdExecFactory()).build();
return DockerClientBuilder.getInstance(config).withDockerCmdExecFactory(new OkHttpDockerCmdExecFactory()).build();
}

/**
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down