Skip to content

Commit c3ce1b1

Browse files
committed
Simplify the path evaluation for docker
Authored-by: Leonhardt Koepsell <[email protected]>
1 parent 6a24ff2 commit c3ce1b1

File tree

4 files changed

+9
-24
lines changed

4 files changed

+9
-24
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ All notable changes to this project will be documented in this file.
99
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
1010
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
1111

12+
## [Unreleased]
13+
14+
### Fixed
15+
16+
- Simplify the path evaluation for docker
17+
1218
## [0.1.0] - 2024-11-07
1319

1420
### Added

src/main/kotlin/dev/codebandits/container/gradle/tasks/Commands.kt

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/main/kotlin/dev/codebandits/container/gradle/tasks/ContainerRunTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public abstract class ContainerRunTask : ContainerExecTask() {
4646
actionSteps.add(
4747
ExecutionStep(
4848
execAction = {
49-
executable = Commands.dockerPath
49+
executable = "docker"
5050
args(*dockerArgs)
5151
val dockerHost = spec.dockerHost.orNull
5252
if (dockerHost != null) {

src/main/kotlin/dev/codebandits/container/gradle/tasks/TaskImages.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public abstract class TaskImages(private val task: Task) {
2424
execAction = {
2525
val file = imageIdentifierFileProvider.get().asFile
2626
file.parentFile.mkdirs()
27-
executable = Commands.dockerPath
27+
executable = "docker"
2828
args("inspect", "--format", "{{.Id}}", imageReference)
2929
standardOutput = imageIdentifierFileProvider.get().asFile.outputStream()
3030
errorOutput = OutputStream.nullOutputStream()
@@ -57,7 +57,7 @@ public abstract class TaskImages(private val task: Task) {
5757
execAction = {
5858
val file = imageIdentifierFileProvider.get().asFile
5959
file.parentFile.mkdirs()
60-
this.executable = Commands.dockerPath
60+
executable = "docker"
6161
args("manifest", "inspect", imageReference)
6262
standardOutput = file.outputStream()
6363
isIgnoreExitValue = true

0 commit comments

Comments
 (0)