fix(Makefile/brigade.js): fix the 'command: command not found' instances

- switch to `which` for binary detection
cnabio · Nov 26, 2018 · 363ad0a · 363ad0a
1 parent c4040b6
commit 363ad0a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ ifeq ($(OS),Windows_NT)
 else
 	TARGET = $(PROJECT)
 	SHELL  ?= bash
-	CHECK  = command -v
+	CHECK  ?= which
 endif
 
 GIT_TAG   := $(shell git describe --tags --always)

diff --git a/brigade.js b/brigade.js
@@ -15,8 +15,8 @@ function build(e, project) {
 
   // Set a few environment variables.
   build.env = {
-    "DEST_PATH": localPath,
-    "GOPATH": gopath
+    DEST_PATH: localPath,
+    GOPATH: gopath
   };
 
   // Run Go unit tests
@@ -175,8 +175,8 @@ function goDockerBuild(e, p) {
 
   goDockerBuild.storage.enabled = true;
   goDockerBuild.env = {
-    "DEST_PATH": localPath,
-    "GOPATH": gopath
+    DEST_PATH: localPath,
+    GOPATH: gopath
   };
   goDockerBuild.tasks = [
     "cd /src",
@@ -199,14 +199,20 @@ function dockerhubPublish(project, tag) {
   let dockerRegistry = project.secrets.dockerhubRegistry || "docker.io";
   let dockerOrg = project.secrets.dockerhubOrg || "deis";
 
+  publisher.env = {
+    SHELL: "/bin/sh",
+    DOCKER_REGISTRY: dockerOrg,
+    VERSION: tag
+  }
+
   publisher.docker.enabled = true;
   publisher.storage.enabled = true;
   publisher.tasks = [
     "apk add --update --no-cache make",
     `docker login ${dockerRegistry} -u ${project.secrets.dockerhubUsername} -p ${project.secrets.dockerhubPassword}`,
     "cd /src",
     "cp -av /mnt/brigade/share/bin ./",
-    `SHELL=/bin/sh DOCKER_REGISTRY=${dockerOrg} VERSION=${tag} make docker-build docker-push`,
+    `make docker-build docker-push`,
     `docker logout ${dockerRegistry}`
   ];