Merge pull request #376 from vdice/unique-bintray-version

fix(bintray): assign each binary a name using unique version

Author: mboersma

.gitignore

@@ -24,6 +24,7 @@ client/client
 client/deis.exe
 client/*.run
 client/makeself/
+_dist/
 docs/_build/
 docs/docs.zip
 docs/dummy.sqlite3

_scripts/ci/bintray-template.json

@@ -9,7 +9,7 @@
   },
   "files": [
     {
-      "includePattern": "_dist/(.*)",
+      "includePattern": "client/_dist/(.*)",
       "uploadPattern": "$1"
     }
   ],

client/Makefile

@@ -3,7 +3,7 @@ export GO15VENDOREXPERIMENT=1
 # the filepath to this repository, relative to $GOPATH/src
 repo_path = github.com/deis/workflow/client
 
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.5.0
+DEV_ENV_IMAGE := quay.io/deis/go-dev:0.7.0
 DEV_ENV_WORK_DIR := /go/src/${repo_path}
 DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
@@ -27,7 +27,6 @@ define check-static-binary
 endef
 
 bootstrap:
-	go get -u github.com/mitchellh/gox
 	${DEV_ENV_CMD} glide install
 
 glideup:
@@ -38,7 +37,7 @@ build:
 	@$(call check-static-binary,deis)
 
 build-all:
-	gox -verbose \
+	${DEV_ENV_CMD} gox -verbose \
 	-os="linux darwin " \
 	-arch="amd64 386" \
 	-output="$(DIST_DIR)/deis-${VERSION}-{{.OS}}-{{.Arch}}" .