Skip to content

Commit 5f9254a

Browse files
committed
fix: dockerComposeWorkingDirectory is used when looking for services names, for older Docker Compose versions
Fixes #310
1 parent 085c0a7 commit 5f9254a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,11 @@ class ComposeExecutor {
183183
}
184184

185185
Iterable<File> getStandardComposeFiles() {
186+
File searchDirectory = fileOps.file(settings.dockerComposeWorkingDirectory) ?: layout.projectDirectory.getAsFile()
186187
def res = []
187-
def f = findInParentDirectories('docker-compose.yml', layout.projectDirectory.getAsFile())
188+
def f = findInParentDirectories('docker-compose.yml', searchDirectory)
188189
if (f != null) res.add(f)
189-
f = findInParentDirectories('docker-compose.override.yml', layout.projectDirectory.getAsFile())
190+
f = findInParentDirectories('docker-compose.override.yml', searchDirectory)
190191
if (f != null) res.add(f)
191192
res
192193
}

0 commit comments

Comments
 (0)