Skip to content

Commit

Permalink
Specify the docker api version (#388)
Browse files Browse the repository at this point in the history
* adjusting the requirements

* adjusting the requirements

* requiring specific docker api version

* [Gradle Release Plugin] - new version commit:  '3.14.5'.

* release notes
  • Loading branch information
mageddo authored Mar 21, 2023
1 parent 0bd970f commit 9e70a7d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 3.14.5
* Specify minimum required docker api version `1.21` (as DPS 2)

## 3.14.4
* Fixing regression on version 3.14 host.docker wasn't solving host IP when running inside a container, see #384.

Expand Down
3 changes: 1 addition & 2 deletions docs/content/1-getting-started/requirements/_index.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ weight: 2
---

### Requirements

* Linux/Windows/Mac
* Docker 1.9.x (Only if you run DPS using docker or want to solve docker containers hostname using DPS)
* Docker 1.21.x (Only if you run DPS using docker or want to solve docker containers hostname using DPS)
* Jre 19+ (When running the jar version)
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=3.14.4
version=3.14.5
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.core.DefaultDockerClientConfig;
import com.github.dockerjava.core.DockerClientImpl;
import com.github.dockerjava.core.RemoteApiVersion;
import com.github.dockerjava.httpclient5.ApacheDockerHttpClient;
import com.mageddo.commons.lang.Objects;
import com.mageddo.dnsproxyserver.config.Configs;
Expand All @@ -22,6 +23,7 @@ public DockerClient dockerClient() {
final var config = DefaultDockerClientConfig.createDefaultConfigBuilder()
.withDockerHost(Objects.mapOrNull(dockerHost, URI::toString))
.withDockerTlsVerify(false)
.withApiVersion(RemoteApiVersion.VERSION_1_21)
// .withDockerCertPath("/home/user/.docker")
// .withRegistryUsername(registryUser)
// .withRegistryPassword(registryPass)
Expand Down

0 comments on commit 9e70a7d

Please sign in to comment.