From 202d0db72d387b46aa9e265615ed2a752304a72a Mon Sep 17 00:00:00 2001 From: Reto Weiss Date: Mon, 23 Oct 2023 13:26:55 +0200 Subject: [PATCH] Remove commented code and improve documentation for podman --- docker-connector/config/variables.yaml | 10 ++++++++-- .../com/axonivy/connector/docker/IvyDockerClient.java | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker-connector/config/variables.yaml b/docker-connector/config/variables.yaml index 2b58dfe..e660760 100644 --- a/docker-connector/config/variables.yaml +++ b/docker-connector/config/variables.yaml @@ -8,12 +8,18 @@ Variables: Docker: # URL to communicate with the docker daemon - # Windows Pipe (localhost only): + # Windows Docker Desktop [https://www.docker.com/products/docker-desktop/] (localhost only): # npipe:////./pipe/dockerDesktopLinuxEngine + # + # Windows Podman [https://podman.io] (localhost only): + # npipe:////./pipe/docker_engine + # # Linux (localhost only): # unix:///var/run/docker.sock + # # TCP (Outside container): # tcp://localhost:2375 + # # TCP (Inside a container): - # tcp://host.docker.internal:2375 + # tcp://host.docker.internal:2375 URL: "unix:///var/run/docker.sock" \ No newline at end of file diff --git a/docker-connector/src/com/axonivy/connector/docker/IvyDockerClient.java b/docker-connector/src/com/axonivy/connector/docker/IvyDockerClient.java index 34b1107..7662175 100644 --- a/docker-connector/src/com/axonivy/connector/docker/IvyDockerClient.java +++ b/docker-connector/src/com/axonivy/connector/docker/IvyDockerClient.java @@ -34,13 +34,10 @@ private static DockerClient createDockerClient() { var dockerUrl = Ivy.var().get("Docker.URL"); var config = DefaultDockerClientConfig.createDefaultConfigBuilder() .withDockerHost(dockerUrl) -// .withDockerTlsVerify(true) -// .withDockerCertPath("C:\\Users\\rwei.ZUGPCRWEI2\\AppData\\Local\\Docker\\pki") .build(); var httpClient = new ApacheDockerHttpClient.Builder() .dockerHost(config.getDockerHost()) -// .sslConfig(config.getSSLConfig()) .maxConnections(100) .connectionTimeout(Duration.ofSeconds(30)) .responseTimeout(Duration.ofSeconds(45)) @@ -113,5 +110,4 @@ public void copyToContainer(Path hostPath, String containerId, String containerP .withRemotePath(containerPath) .exec(); } - }