dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-arrange repo files for root dir cleanup

Browse Source
This commit is contained in:
Cameron Sparr
2015-09-09 12:19:07 -06:00
parent a9b97c7a2b
commit a7ed46160a
7 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -22,10 +22,11 @@ prepare:
docker-compose:
ifeq ($(UNAME), Darwin)
ADVERTISED_HOST=$(shell sh -c 'boot2docker ip') docker-compose up -d
ADVERTISED_HOST=$(shell sh -c 'boot2docker ip || docker-machine ip default') \
docker-compose --file scripts/docker-compose.yml up -d
endif
ifeq ($(UNAME), Linux)
ADVERTISED_HOST=localhost docker-compose up -d
ADVERTISED_HOST=localhost docker-compose --file scripts/docker-compose.yml up -d
endif
test: prepare docker-compose
@@ -35,6 +36,6 @@ test-short: prepare
$(GOPATH)/bin/godep go test -short ./...
test-cleanup:
docker-compose kill
docker-compose --file scripts/docker-compose.yml kill
.PHONY: test