Merge branch 'master' into maxlife

Author: David Chung

Makefile

@@ -11,6 +11,9 @@ DOCKER_CLIENT_VERSION?=1.24
 # True to run e2e test
 E2E_TESTS?=true
 
+#Source file target
+SRCS  := $(shell find . -type f -name '*.go')
+
 # Allow turning off function inlining and variable registerization
 ifeq (${DISABLE_OPTIMIZATION},true)
 	GO_GCFLAGS=-gcflags "-N -l"
@@ -128,7 +131,7 @@ clean:
 	mkdir -p build
 
 define binary_target_template
-build/$(1):
+build/$(1): $(SRCS)
 	go build -o build/$(1) \
 		-ldflags "-X github.com/docker/infrakit/pkg/cli.Version=$(VERSION) -X github.com/docker/infrakit/pkg/cli.Revision=$(REVISION) -X github.com/docker/infrakit/pkg/util/docker.ClientVersion=$(DOCKER_CLIENT_VERSION)" $(2)
 endef

examples/instance/terraform/apply.go

@@ -26,8 +26,9 @@ func (p *plugin) terraformApply() error {
 			if err := p.lock.TryLock(); err == nil {
 				defer p.lock.Unlock()
 				doTerraformApply(p.Dir)
+			} else {
+				log.Debugln("Can't acquire lock, waiting")
 			}
-			log.Debugln("Can't acquire lock, waiting")
 			time.Sleep(time.Duration(int64(rand.NormFloat64())%1000) * time.Millisecond)
 		}
 	}()

pkg/cli/services.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"strconv"
 	"strings"
 
 	"github.com/docker/infrakit/pkg/discovery"
@@ -171,7 +172,15 @@ func templateProcessor(plugins func() discovery.Plugins) (*pflag.FlagSet, ToJSON
 				key := strings.TrimSpace(kv[0])
 				val := strings.TrimSpace(kv[1])
 				if key != "" && val != "" {
-					engine.Global(key, val)
+					// Attempt to convert to int and bool types so that template operations
+					// are not only against strings.
+					if intVal, err := strconv.Atoi(val); err == nil {
+						engine.Global(key, intVal)
+					} else if boolVar, err := strconv.ParseBool(val); err == nil {
+						engine.Global(key, boolVar)
+					} else {
+						engine.Global(key, val)
+					}
 				}
 			}