commit a9f72503832180d2212ec087d7d70ebe329be3a1
author Zsolt Haraszti <zharaszt@ciena.com> Thu May 12 16:07:03 2016 -0700
committer Zsolt Haraszti <zharaszt@ciena.com> Thu May 12 16:07:03 2016 -0700
tree ef25b5d83f4ea5fd111937168617d77034f8f372
parent 11340bee43f1f0f9ba9a25342c48784bdb9e7d09

Escalating and building/publishing in maas

build.gradle

diff --git a/build.gradle b/build.gradle
index 0c2527b..8224404 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,13 +38,13 @@
 ext {
 
     // Upstream registry to simplify filling out the comps table below
-    upstreamReg = 'docker.io'
+    upstreamReg = project.hasProperty('upstreamReg') ? project.getProperty('upstreamReg') : 'docker.io'
 
     // Target registry to be used to publish docker images needed for deployment
-    targetReg = 'localhost:5000'
+    targetReg = project.hasProperty('targetReg') ? project.getProperty('targetReg') : 'localhost:5000'
 
     // The tag used to tag the docker images push to the target registry
-    targetTag = 'candidate'
+    targetTag = project.hasProperty('targetTag') ? project.getProperty('targetTag') : 'candidate'
 
     // Component table
     comps = [
@@ -71,8 +71,7 @@
 
     // Deployment target config file (yaml format); this can be overwritten from the command line
     // using the -PdeployConfig=<file-path> syntax.
-    deployConfig = project.hasProperty('deployConfig') ?
-            project.getProperty('deployConfig') : './config/default.yml'
+    deployConfig = project.hasProperty('deployConfig') ? project.getProperty('deployConfig') : './config/default.yml'
 
 }
 
@@ -90,7 +89,7 @@
 }
 
 task publishImages {
-    comps.each { name, _ -> dependsOn "publish" + name }
+    comps.each { name, spec -> if (spec.type == 'image') { dependsOn "publish" + name } }
 }
 
 task publish {