Merge pull request #29 from pzbitskiy/master

Fixes #26: Pass environment to all docker-compose invocations
avast · Jun 14, 2016 · 7d9b0f7 · 7d9b0f7
2 parents bbf84be + 1477d6b
commit 7d9b0f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 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
@@ -19,6 +19,7 @@ class ComposeDown extends DefaultTask {
     void down() {
         if (extension.stopContainers) {
             project.exec { ExecSpec e ->
+                e.environment = extension.environment
                 e.commandLine extension.composeCommand('stop')
             }
             if (extension.removeContainers) {
@@ -36,10 +37,12 @@ class ComposeDown extends DefaultTask {
                         args += ['--volumes']
                     }
                     project.exec { ExecSpec e ->
+                        e.environment = extension.environment
                         e.commandLine extension.composeCommand(args)
                     }
                 } else {
                     project.exec { ExecSpec e ->
+                        e.environment = extension.environment
                         e.commandLine extension.composeCommand('rm', '-f')
                     }
                 }
@@ -50,6 +53,7 @@ class ComposeDown extends DefaultTask {
     VersionNumber getDockerComposeVersion() {
         new ByteArrayOutputStream().withStream { os ->
             project.exec { ExecSpec e ->
+                e.environment = extension.environment
                 e.commandLine extension.composeCommand('--version')
                 e.standardOutput = os
             }

diff --git a/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeUp.groovy b/src/main/groovy/com/avast/gradle/dockercompose/tasks/ComposeUp.groovy
@@ -79,6 +79,7 @@ class ComposeUp extends DefaultTask {
     String getContainerId(String serviceName) {
         new ByteArrayOutputStream().withStream { os ->
             project.exec { ExecSpec e ->
+                e.environment = extension.environment
                 e.commandLine extension.composeCommand('ps', '-q', serviceName)
                 e.standardOutput = os
             }