fix: -f always comes directly after docker compose Fixes #414

avast · Aug 9, 2023 · 101f4ce · 101f4ce
1 parent 1c4d194
commit 101f4ce
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/ComposeExecutor.groovy b/src/main/groovy/com/avast/gradle/dockercompose/ComposeExecutor.groovy
@@ -86,6 +86,7 @@ abstract class ComposeExecutor implements BuildService<Parameters>, AutoCloseabl
 
             def finalArgs = []
             finalArgs.addAll(getDockerComposeBaseCommand())
+            finalArgs.addAll(parameters.useComposeFiles.get().collectMany { ['-f', it].asCollection() })
             finalArgs.addAll(parameters.composeAdditionalArgs.get())
             if (noAnsi) {
                 if (version >= VersionNumber.parse('1.28.0')) {
@@ -94,7 +95,6 @@ abstract class ComposeExecutor implements BuildService<Parameters>, AutoCloseabl
                     finalArgs.add('--no-ansi')
                 }
             }
-            finalArgs.addAll(parameters.useComposeFiles.get().collectMany { ['-f', it].asCollection() })
             String pn = parameters.projectName.getOrNull()
             if (pn) {
                 finalArgs.addAll(['-p', pn])