From d30fc5bcda1e1cc0179110bdb766f676724b6b65 Mon Sep 17 00:00:00 2001
From: Gero Lueckemeyer <gero.lueckemeyer@hft-stuttgart.de>
Date: Wed, 18 Oct 2023 23:30:38 +0200
Subject: [PATCH] replaced apache docker http client with zerodep http client
---
pom.xml | 8 ++++----
.../de/hftstuttgart/dtabackend/utils/DockerUtil.java | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9484f74..7790a5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,10 +122,10 @@
<version>3.3.3</version>
</dependency>
<dependency>
- <groupId>com.github.docker-java</groupId>
- <artifactId>docker-java-transport-httpclient5</artifactId>
- <version>3.3.3</version>
- </dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-transport-zerodep</artifactId>
+ <version>3.3.3</version>
+ </dependency>
<!--dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-core</artifactId>
diff --git a/src/main/java/de/hftstuttgart/dtabackend/utils/DockerUtil.java b/src/main/java/de/hftstuttgart/dtabackend/utils/DockerUtil.java
index 6e6feb0..68f4e94 100644
--- a/src/main/java/de/hftstuttgart/dtabackend/utils/DockerUtil.java
+++ b/src/main/java/de/hftstuttgart/dtabackend/utils/DockerUtil.java
@@ -8,8 +8,8 @@ import com.github.dockerjava.api.model.HostConfig;
import com.github.dockerjava.core.DefaultDockerClientConfig;
import com.github.dockerjava.core.DockerClientConfig;
import com.github.dockerjava.core.DockerClientImpl;
-import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
import com.github.dockerjava.transport.DockerHttpClient;
+import com.github.dockerjava.zerodep.ZerodepDockerHttpClient;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.core.env.Environment;
@@ -29,10 +29,10 @@ public class DockerUtil {
DockerClientConfig dockerClientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
LOG.debug("create docker http client");
- DockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
- .dockerHost(dockerClientConfig.getDockerHost())
- .sslConfig(dockerClientConfig.getSSLConfig())
- .build();
+ ZerodepDockerHttpClient httpClient = new ZerodepDockerHttpClient.Builder()
+ .dockerHost(dockerClientConfig.getDockerHost())
+ .sslConfig(dockerClientConfig.getSSLConfig())
+ .build();
LOG.debug("create docker client");
dockerClient = DockerClientImpl.getInstance(dockerClientConfig, httpClient);
--
GitLab