11package com.avast.gradle.dockercompose
22
3-
43import groovy.transform.CompileStatic
54import org.gradle.api.Project
65import org.gradle.api.Task
@@ -11,7 +10,6 @@ import org.gradle.api.provider.MapProperty
1110import org.gradle.api.provider.Property
1211import org.gradle.api.provider.Provider
1312import org.gradle.api.tasks.TaskProvider
14- import org.gradle.internal.os.OperatingSystem
1513import org.gradle.process.JavaForkOptions
1614import 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