makefile: ADVERTISED_HOST needs only be set during docker-compose target

This commit is contained in:
Cameron Sparr 2015-08-25 16:34:30 -06:00
parent 8d034f544c
commit ac97fefb91
1 changed files with 3 additions and 6 deletions

View File

@ -10,17 +10,14 @@ prepare:
go get github.com/tools/godep go get github.com/tools/godep
docker-compose: docker-compose:
docker-compose up -d
test:
ifeq ($(UNAME), Darwin) 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 endif
ifeq ($(UNAME), Linux) ifeq ($(UNAME), Linux)
ADVERTISED_HOST=localhost $(MAKE) test-full ADVERTISED_HOST=localhost docker-compose up -d
endif endif
test-full: prepare docker-compose test: prepare docker-compose
$(GOPATH)/bin/godep go test -v ./... $(GOPATH)/bin/godep go test -v ./...
test-short: prepare test-short: prepare