Merge pull request #78 from alexarana/master

Moved --remove-orphans option from 'stop' to 'down' command
avast · May 22, 2017 · 0a3255e · 0a3255e
2 parents 8ef65ac + efec875
commit 0a3255e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeDown.groovy b/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeDown.groovy
@@ -22,9 +22,6 @@ class ComposeDown extends DefaultTask {
                 extension.setExecSpecWorkingDirectory(e)
                 e.environment = extension.environment
                 String[] args = ['stop', '--timeout', extension.dockerComposeStopTimeout.getSeconds()]
-                if (extension.removeOrphans()) {
-                    args += '--remove-orphans'
-                }
                 e.commandLine extension.composeCommand(args)
             }
             if (extension.removeContainers) {
@@ -41,6 +38,9 @@ class ComposeDown extends DefaultTask {
                     if(extension.removeVolumes) {
                         args += ['--volumes']
                     }
+                    if (extension.removeOrphans()) {
+                        args += '--remove-orphans'
+                    }
                     project.exec { ExecSpec e ->
                         extension.setExecSpecWorkingDirectory(e)
                         e.environment = extension.environment