Merge pull request #3133 from aledbf/fix_go_static_binaries

fix(go): go 1.4 static binaries

Author: carmstrong

builder/Makefile

@@ -15,7 +15,7 @@ BINARY_DEST_DIR := image/bin
 
 build: check-docker
 	for i in $(BINARIES); do \
-		GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o $(BINARY_DEST_DIR)/$$i bin/$$i.go || exit 1; \
+		GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -v -ldflags '-s' -o $(BINARY_DEST_DIR)/$$i bin/$$i.go || exit 1; \
 	done
 	docker build -t $(IMAGE) image
 

cache/Makefile

@@ -13,7 +13,7 @@ BUILD_IMAGE = $(COMPONENT)-build
 BINARY_DEST_DIR = image/bin
 
 build: check-docker
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o $(BINARY_DEST_DIR)/boot main.go || exit 1
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -v -ldflags '-s' -o $(BINARY_DEST_DIR)/boot main.go || exit 1
 	docker build -t $(BUILD_IMAGE) .
 	docker cp `docker run -d $(BUILD_IMAGE)`:/usr/local/bin/redis-server $(BINARY_DEST_DIR)/
 	docker build -t $(IMAGE) image

contrib/bumpver/Makefile

@@ -1,5 +1,5 @@
 build:
-	CGO_ENABLED=0 godep go build -a -ldflags '-s' .
+	CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' .
 
 upx:
 	upx -9 --brute bumpver && upx -t bumpver

deisctl/Makefile

@@ -11,11 +11,11 @@ COMPONENT = $(notdir $(repo_path))
 IMAGE =  $(IMAGE_PREFIX)/$(COMPONENT):$(BUILD_TAG)
 
 build:
-	CGO_ENABLED=0 godep go build -a -ldflags '-s' .
+	CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' .
 
 installer:
 	rm -rf dist && mkdir -p dist
-	CGO_ENABLED=0 godep go build -a -ldflags '-s' -o dist/deisctl .
+	CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' -o dist/deisctl .
 	@if [ ! -d makeself ]; then git clone -b single-binary https://github.com/deis/makeself.git; fi
 	PATH=./makeself:$$PATH BINARY=deisctl makeself.sh --bzip2 --current --nox11 dist \
 		dist/deisctl-`cat deis-version`-`go env GOOS`-`go env GOARCH`.run "Deis Control Utility" \

logger/Makefile

@@ -14,7 +14,7 @@ DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
 BINARY_DEST_DIR = image/bin
 
 build: check-docker
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o $(BINARY_DEST_DIR)/logger github.com/deis/deis/logger || exit 1
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -v -ldflags '-s' -o $(BINARY_DEST_DIR)/logger github.com/deis/deis/logger || exit 1
 	docker build -t $(IMAGE) image
 
 clean: check-docker check-registry

logspout/Makefile

@@ -13,7 +13,7 @@ RELEASE_IMAGE := $(DOCKER_IMAGE):$(BUILD_TAG)
 DEV_DOCKER_IMAGE := $(DEV_REGISTRY)/$(RELEASE_IMAGE)
 
 build: check-docker
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o image/logspout
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -v -ldflags '-s' -o image/logspout
 	docker build -t $(RELEASE_IMAGE) image
 
 clean:

publisher/Makefile

@@ -14,7 +14,7 @@ REMOTE_IMAGE := $(REGISTRY)/$(RELEASE_IMAGE)
 BINARY_DEST_DIR = image/bin
 
 build: check-docker
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o $(BINARY_DEST_DIR)/publisher github.com/deis/deis/publisher || exit 1
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -installsuffix cgo -v -ldflags '-s' -o $(BINARY_DEST_DIR)/publisher github.com/deis/deis/publisher || exit 1
 	docker build -t $(RELEASE_IMAGE) image
 
 clean: check-docker check-registry

router/Dockerfile

@@ -14,6 +14,6 @@ RUN go get github.com/tools/godep
 
 ADD . /go/src/github.com/deis/deis/router/
 
-RUN CGO_ENABLED=0 godep go build -a -ldflags '-s' boot.go
+RUN CGO_ENABLED=0 godep go build -a -installsuffix cgo -ldflags '-s' boot.go
 
 RUN cp /go/src/github.com/deis/deis/router/boot /go/bin/boot