Support non-containerized WEAVETOOLS_EXES build

This commit is contained in:
David Wragg committed 2015-02-10 16:05:54 +00:00
1 parent 08c34e4bb9
commit 23233851db
2 files changed
+10

No files matched your search

+1
View File
@@ -30,4 +30,5 @@ _testmain.go
weaver/weaver
weavedns/weavedns
tools/bin
tools/build
releases
+9
View File
@@ -38,8 +38,17 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE): common/*.go
$(WEAVER_EXE): router/*.go weaver/main.go
$(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go
build_weavetools_exes_in_container=yes
$(WEAVETOOLS_EXES): tools/build.sh
ifdef build_weavetools_exes_in_container
$(SUDO) docker run --rm -v $(realpath $(<D)):/home/weave ubuntu sh /home/weave/build.sh
else
rm -rf tools/build
mkdir tools/build
cd tools/build && sh ../../$<
rm -rf tools/build
endif
$(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE)
$(SUDO) docker build -t $(WEAVER_IMAGE) weaver