Merge pull request #646

Compatibility With Docker 25+

Author: mageddo

RELEASE-NOTES.md

@@ -1,3 +1,11 @@
+## 4.0.0
+* Dependency Update: Upgraded Docker Java client library from 3.3.4 to 3.7.0 for latest features, bug fixes, and security updates.
+  * Updated `docker-java-core` and `docker-java-transport-httpclient5` to version 3.7.0.
+* Updated Docker Remote API version from `1.24` to `1.44` to be compatible with the new latest Docker Engine `29.x+`
+
+Breaking Changes
+* Docker Engine >= 25 is now required.
+
 ## 3.32.7
 * Bugfix: Fixing domain env variable setting. #628
 

build.gradle

@@ -69,8 +69,8 @@ dependencies {
   implementation('dev.failsafe:failsafe:3.3.1')
   implementation("io.github.resilience4j:resilience4j-circuitbreaker:2.2.0")
 
-  implementation('com.github.docker-java:docker-java-core:3.3.4')
-  implementation('com.github.docker-java:docker-java-transport-httpclient5:3.3.4')
+  implementation('com.github.docker-java:docker-java-core:3.7.0')
+  implementation('com.github.docker-java:docker-java-transport-httpclient5:3.7.0')
 
   implementation('info.picocli:picocli:4.7.6')
   implementation('com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.3')

docs/content/1-getting-started/requirements/_index.en.md

@@ -5,5 +5,5 @@ weight: 2
 
 ### Requirements
 * Linux/Windows/Mac
-* Docker 1.21.x (Only if you run DPS using docker or want to solve docker containers hostname using DPS)
+* Docker 25 (Only if you run DPS using docker or want to solve docker containers hostname using DPS)
 * Jre 21+ (When running the jar version)

gradle.properties

@@ -1 +1 @@
-version=3.32.7-snapshot
+version=4.0.0-snapshot

src/main/java/com/mageddo/dnsproxyserver/quarkus/DockerConfig.java

@@ -24,7 +24,7 @@ public DockerClient dockerClient() {
     final var config = DefaultDockerClientConfig.createDefaultConfigBuilder()
       .withDockerHost(Objects.mapOrNull(dockerHost, URI::toString))
       .withDockerTlsVerify(false)
-      .withApiVersion(RemoteApiVersion.VERSION_1_24)
+      .withApiVersion(RemoteApiVersion.VERSION_1_44)
 //      .withDockerCertPath("/home/user/.docker")
 //      .withRegistryUsername(registryUser)
 //      .withRegistryPassword(registryPass)