From 07eeb8f577bf773735b52989aec9f98e33cf2dbd 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 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40700fefa5..7fc9819bc2 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,24 @@ SCOPE_UI_BUILD_EXPORT=scope_ui_build.tar SCOPE_UI_BUILD_IMAGE=$(DOCKERHUB_USER)/scope-ui-build GIT_REVISION=$(shell git rev-parse HEAD) +ifeq ("$(DOCKER_SQUASH)","") +$(error Please install docker-squash by running 'make dep') +endif + all: $(SCOPE_EXPORT) $(SCOPE_EXPORT): $(APP_EXE) $(PROBE_EXE) docker/* 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