From c378e72ac322adff04517a4bb12e9037ee99ff7a Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 26 May 2015 15:42:00 +0000 Subject: [PATCH] Check for docker-squash and the correct netgo libs in the makefile. --- Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40700fefa..c912ba667 100644 --- a/Makefile +++ b/Makefile @@ -16,9 +16,18 @@ GIT_REVISION=$(shell git rev-parse HEAD) all: $(SCOPE_EXPORT) $(SCOPE_EXPORT): $(APP_EXE) $(PROBE_EXE) docker/* + @if [ -z '$(DOCKER_SQUASH)' ]; then echo "Please install docker-squash by running 'make dep'." && exit 1; fi cp $(APP_EXE) $(PROBE_EXE) docker/ $(SUDO) docker build -t $(SCOPE_IMAGE) docker/ - $(SUDO) docker save $(SCOPE_IMAGE):latest | $(SUDO) $(DOCKER_SQUASH) -t $(SCOPE_IMAGE) | tee $@ | $(SUDO) docker load + $(SUDO) docker save $(SCOPE_IMAGE):latest | sudo $(DOCKER_SQUASH) -t $(SCOPE_IMAGE) | tee $@ | $(SUDO) docker load + @strings $@ | grep cgo_stub\\\.go >/dev/null || { \ + rm $@; \ + echo "\nYour go standard library was built without the 'netgo' build tag."; \ + echo "To fix that, run"; \ + echo " sudo go clean -i net"; \ + echo " sudo go install -tags netgo std"; \ + false; \ + } $(APP_EXE): app/*.go report/*.go xfer/*.go