only call Gradle once in helper script

wetransform-os · Sep 8, 2017 · d98af19 · d98af19
1 parent d3d615f
commit d98af19
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/groovy/to/wetransform/gradle/swarm/SwarmComposerPlugin.groovy b/src/main/groovy/to/wetransform/gradle/swarm/SwarmComposerPlugin.groovy
@@ -282,16 +282,20 @@ class SwarmComposerPlugin implements Plugin<Project> {
           run = "docker stack deploy --compose-file \"$relPath\" --with-registry-auth ${sc.stackName}"
         }
 
-        def images = "./gradlew -Pquiet=true build-${sc.stackName}-${sc.setupName}"
+        def gradleArgs = []
+
+        gradleArgs.add(0, '-Pquiet=true')
+        gradleArgs << "build-${sc.stackName}-${sc.setupName}"
         if (!composeSupported) {
           // also add push
-          images += "\n./gradlew -Pquiet=true push-${sc.stackName}-${sc.setupName}"
+          gradleArgs << "push-${sc.stackName}-${sc.setupName}"
         }
 
+        gradleArgs << taskName
+
         scriptFile.text = """#!/bin/bash
 set -e
-$images
-./gradlew ${taskName}
+./gradlew ${gradleArgs.join(' ')}
 $run"""
         try {
           ['chmod', 'a+x', scriptFile.absolutePath].execute()