fix(core): autodetect unix socket path for the docker runner

close #601
kestra-io · Aug 2, 2022 · f51d4d2 · f51d4d2
1 parent 5a565bf
commit f51d4d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/AbstractBash.java b/core/src/main/java/io/kestra/core/tasks/scripts/AbstractBash.java
@@ -326,8 +326,7 @@ public static class DockerOptions {
             title = "Docker api uri"
         )
         @PluginProperty(dynamic = true)
-        @Builder.Default
-        private final String dockerHost = "unix:///var/run/docker.sock";
+        private String dockerHost;
 
         @Schema(
             title = "Docker config file",

diff --git a/core/src/main/java/io/kestra/core/tasks/scripts/runners/DockerScriptRunner.java b/core/src/main/java/io/kestra/core/tasks/scripts/runners/DockerScriptRunner.java
@@ -51,9 +51,10 @@ public DockerScriptRunner(ApplicationContext applicationContext) {
     private DockerClient getDockerClient(AbstractBash abstractBash, RunContext runContext, Path workingDirectory) throws IllegalVariableEvaluationException, IOException {
         DefaultDockerClientConfig.Builder dockerClientConfigBuilder = DefaultDockerClientConfig.createDefaultConfigBuilder();
 
+        String dockerHost = null;
         if (abstractBash.getDockerOptions() != null) {
             if (abstractBash.getDockerOptions().getDockerHost() != null) {
-                dockerClientConfigBuilder.withDockerHost(runContext.render(abstractBash.getDockerOptions().getDockerHost()));
+                dockerHost = runContext.render(abstractBash.getDockerOptions().getDockerHost());
             }
 
             if (abstractBash.getDockerOptions().getDockerConfig() != null) {
@@ -66,6 +67,16 @@ private DockerClient getDockerClient(AbstractBash abstractBash, RunContext runCo
             }
         }
 
+        if (dockerHost != null) {
+            dockerClientConfigBuilder.withDockerHost(dockerHost);
+        } else {
+            if (Files.exists(Path.of("/var/run/docker.sock"))) {
+                dockerClientConfigBuilder.withDockerHost("unix:///var/run/docker.sock");
+            } else if (Files.exists(Path.of("/dind/docker.sock"))) {
+                dockerClientConfigBuilder.withDockerHost("unix:///dind/docker.sock");
+            }
+        }
+
         DockerClientConfig dockerClientConfig = dockerClientConfigBuilder.build();
 
         ApacheDockerHttpClient dockerHttpClient = new Builder()