Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CoTA
cota-backend
Commits
d30fc5bc
Commit
d30fc5bc
authored
1 year ago
by
Lückemeyer
Browse files
Options
Download
Email Patches
Plain Diff
replaced apache docker http client with zerodep http client
parent
0b909163
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pom.xml
+4
-4
pom.xml
src/main/java/de/hftstuttgart/dtabackend/utils/DockerUtil.java
+5
-5
...ain/java/de/hftstuttgart/dtabackend/utils/DockerUtil.java
with
9 additions
and
9 deletions
+9
-9
pom.xml
+
4
-
4
View file @
d30fc5bc
...
@@ -122,10 +122,10 @@
...
@@ -122,10 +122,10 @@
<version>
3.3.3
</version>
<version>
3.3.3
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.github.docker-java
</groupId>
<groupId>
com.github.docker-java
</groupId>
<artifactId>
docker-java-transport-
httpclient5
</artifactId>
<artifactId>
docker-java-transport-
zerodep
</artifactId>
<version>
3.3.3
</version>
<version>
3.3.3
</version>
</dependency>
</dependency>
<!--dependency>
<!--dependency>
<groupId>com.github.docker-java</groupId>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-core</artifactId>
<artifactId>docker-java-core</artifactId>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/hftstuttgart/dtabackend/utils/DockerUtil.java
+
5
-
5
View file @
d30fc5bc
...
@@ -8,8 +8,8 @@ import com.github.dockerjava.api.model.HostConfig;
...
@@ -8,8 +8,8 @@ import com.github.dockerjava.api.model.HostConfig;
import
com.github.dockerjava.core.DefaultDockerClientConfig
;
import
com.github.dockerjava.core.DefaultDockerClientConfig
;
import
com.github.dockerjava.core.DockerClientConfig
;
import
com.github.dockerjava.core.DockerClientConfig
;
import
com.github.dockerjava.core.DockerClientImpl
;
import
com.github.dockerjava.core.DockerClientImpl
;
import
com.github.dockerjava.httpclient5.ApacheDockerHttpClient
;
import
com.github.dockerjava.transport.DockerHttpClient
;
import
com.github.dockerjava.transport.DockerHttpClient
;
import
com.github.dockerjava.zerodep.ZerodepDockerHttpClient
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.env.Environment
;
...
@@ -29,10 +29,10 @@ public class DockerUtil {
...
@@ -29,10 +29,10 @@ public class DockerUtil {
DockerClientConfig
dockerClientConfig
=
DefaultDockerClientConfig
.
createDefaultConfigBuilder
().
build
();
DockerClientConfig
dockerClientConfig
=
DefaultDockerClientConfig
.
createDefaultConfigBuilder
().
build
();
LOG
.
debug
(
"create docker http client"
);
LOG
.
debug
(
"create docker http client"
);
DockerHttpClient
httpClient
=
new
Apache
DockerHttpClient
.
Builder
()
Zerodep
DockerHttpClient
httpClient
=
new
Zerodep
DockerHttpClient
.
Builder
()
.
dockerHost
(
dockerClientConfig
.
getDockerHost
())
.
dockerHost
(
dockerClientConfig
.
getDockerHost
())
.
sslConfig
(
dockerClientConfig
.
getSSLConfig
())
.
sslConfig
(
dockerClientConfig
.
getSSLConfig
())
.
build
();
.
build
();
LOG
.
debug
(
"create docker client"
);
LOG
.
debug
(
"create docker client"
);
dockerClient
=
DockerClientImpl
.
getInstance
(
dockerClientConfig
,
httpClient
);
dockerClient
=
DockerClientImpl
.
getInstance
(
dockerClientConfig
,
httpClient
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets