Simplify the path evaluation for docker

Authored-by: Leonhardt Koepsell <[email protected]>
codebandits · Nov 9, 2024 · c3ce1b1 · c3ce1b1
1 parent 6a24ff2
commit c3ce1b1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Simplify the path evaluation for docker
+
 ## [0.1.0] - 2024-11-07
 
 ### Added

diff --git a/src/main/kotlin/dev/codebandits/container/gradle/tasks/Commands.kt b/src/main/kotlin/dev/codebandits/container/gradle/tasks/Commands.kt
diff --git a/src/main/kotlin/dev/codebandits/container/gradle/tasks/ContainerRunTask.kt b/src/main/kotlin/dev/codebandits/container/gradle/tasks/ContainerRunTask.kt
@@ -46,7 +46,7 @@ public abstract class ContainerRunTask : ContainerExecTask() {
     actionSteps.add(
       ExecutionStep(
         execAction = {
-          executable = Commands.dockerPath
+          executable = "docker"
           args(*dockerArgs)
           val dockerHost = spec.dockerHost.orNull
           if (dockerHost != null) {

diff --git a/src/main/kotlin/dev/codebandits/container/gradle/tasks/TaskImages.kt b/src/main/kotlin/dev/codebandits/container/gradle/tasks/TaskImages.kt
@@ -24,7 +24,7 @@ public abstract class TaskImages(private val task: Task) {
       execAction = {
         val file = imageIdentifierFileProvider.get().asFile
         file.parentFile.mkdirs()
-        executable = Commands.dockerPath
+        executable = "docker"
         args("inspect", "--format", "{{.Id}}", imageReference)
         standardOutput = imageIdentifierFileProvider.get().asFile.outputStream()
         errorOutput = OutputStream.nullOutputStream()
@@ -57,7 +57,7 @@ public abstract class TaskImages(private val task: Task) {
       execAction = {
         val file = imageIdentifierFileProvider.get().asFile
         file.parentFile.mkdirs()
-        this.executable = Commands.dockerPath
+        executable = "docker"
         args("manifest", "inspect", imageReference)
         standardOutput = file.outputStream()
         isIgnoreExitValue = true