From ac97fefb91f7fb443be188d9f23a303fc28d58e9 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Tue, 25 Aug 2015 16:34:30 -0600 Subject: [PATCH] makefile: ADVERTISED_HOST needs only be set during docker-compose target --- Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1e2f9c383..5c27c5d95 100644 --- a/Makefile +++ b/Makefile @@ -10,17 +10,14 @@ prepare: go get github.com/tools/godep docker-compose: - docker-compose up -d - -test: ifeq ($(UNAME), Darwin) - ADVERTISED_HOST=$(shell sh -c 'boot2docker ip') $(MAKE) test-full + ADVERTISED_HOST=$(shell sh -c 'boot2docker ip') docker-compose up -d endif ifeq ($(UNAME), Linux) - ADVERTISED_HOST=localhost $(MAKE) test-full + ADVERTISED_HOST=localhost docker-compose up -d endif -test-full: prepare docker-compose +test: prepare docker-compose $(GOPATH)/bin/godep go test -v ./... test-short: prepare