Skip to content

Commit 601218a

Browse files
committed
feat: MacOS-specific defaults for executable and dockerExecutable removed
1 parent a6afb55 commit 601218a

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

src/main/groovy/com/avast/gradle/dockercompose/ComposeSettings.groovy

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.avast.gradle.dockercompose
22

3-
43
import groovy.transform.CompileStatic
54
import org.gradle.api.Project
65
import org.gradle.api.Task
@@ -11,7 +10,6 @@ import org.gradle.api.provider.MapProperty
1110
import org.gradle.api.provider.Property
1211
import org.gradle.api.provider.Provider
1312
import org.gradle.api.tasks.TaskProvider
14-
import org.gradle.internal.os.OperatingSystem
1513
import org.gradle.process.JavaForkOptions
1614
import org.gradle.process.ProcessForkOptions
1715

@@ -144,15 +142,9 @@ abstract class ComposeSettings {
144142

145143
captureContainersOutput.set(false)
146144

147-
if (OperatingSystem.current().isMacOsX()) {
148-
// Default installation is inaccessible from path, so set sensible
149-
// defaults for this platform.
150-
executable.set('/usr/local/bin/docker-compose')
151-
dockerExecutable.set('/usr/local/bin/docker')
152-
} else {
153-
executable.set('docker-compose')
154-
dockerExecutable.set('docker')
155-
}
145+
executable.set('docker-compose')
146+
dockerExecutable.set('docker')
147+
156148
dockerComposeStopTimeout.set(Duration.ofSeconds(10))
157149

158150
this.containerLogToDir.set(project.buildDir.toPath().resolve('containers-logs').toFile())

0 commit comments

Comments
 (0)