Merge branch '1.3'
Conflicts: Makefile
This commit is contained in:
commit
d0be36dc9b
2 files changed
+7
-5
No files matched your search
@@ -18,8 +18,9 @@ NETCHECK_EXE=prog/netcheck/netcheck
|
|||||||
DOCKERTLSARGS_EXE=prog/docker_tls_args/docker_tls_args
|
DOCKERTLSARGS_EXE=prog/docker_tls_args/docker_tls_args
|
||||||
DOCKERPLUGIN_EXE=prog/plugin/plugin
|
DOCKERPLUGIN_EXE=prog/plugin/plugin
|
||||||
RUNNER_EXE=tools/runner/runner
|
RUNNER_EXE=tools/runner/runner
|
||||||
|
TEST_TLS_EXE=test/tls/tls
|
||||||
|
|
||||||
EXES=$(WEAVER_EXE) $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) $(WEAVEWAIT_NOOP_EXE) $(NETCHECK_EXE) $(DOCKERTLSARGS_EXE) $(DOCKERPLUGIN_EXE)
|
EXES=$(WEAVER_EXE) $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) $(WEAVEWAIT_NOOP_EXE) $(NETCHECK_EXE) $(DOCKERTLSARGS_EXE) $(DOCKERPLUGIN_EXE) $(TEST_TLS_EXE)
|
||||||
|
|
||||||
WEAVER_UPTODATE=.weaver.uptodate
|
WEAVER_UPTODATE=.weaver.uptodate
|
||||||
WEAVEEXEC_UPTODATE=.weaveexec.uptodate
|
WEAVEEXEC_UPTODATE=.weaveexec.uptodate
|
||||||
@@ -50,7 +51,7 @@ BUILD_FLAGS=-ldflags "-extldflags \"-static\" -X main.version $(WEAVE_VERSION)"
|
|||||||
|
|
||||||
PACKAGE_BASE=$(shell go list -e ./)
|
PACKAGE_BASE=$(shell go list -e ./)
|
||||||
|
|
||||||
all: $(WEAVE_EXPORT) $(RUNNER_EXE)
|
all: $(WEAVE_EXPORT) $(RUNNER_EXE) $(TEST_TLS_EXE)
|
||||||
|
|
||||||
travis: $(EXES)
|
travis: $(EXES)
|
||||||
|
|
||||||
@@ -83,8 +84,9 @@ $(SIGPROXY_EXE): prog/sigproxy/main.go
|
|||||||
$(WEAVEWAIT_EXE): prog/weavewait/*.go net/*.go
|
$(WEAVEWAIT_EXE): prog/weavewait/*.go net/*.go
|
||||||
$(DOCKERTLSARGS_EXE): prog/docker_tls_args/*.go
|
$(DOCKERTLSARGS_EXE): prog/docker_tls_args/*.go
|
||||||
$(DOCKERPLUGIN_EXE): prog/plugin/*.go plugin/*.go plugin/skel/*.go api/*.go common/docker/*.go
|
$(DOCKERPLUGIN_EXE): prog/plugin/*.go plugin/*.go plugin/skel/*.go api/*.go common/docker/*.go
|
||||||
|
$(TEST_TLS_EXE): test/tls/*.go
|
||||||
|
|
||||||
$(WEAVEWAIT_EXE) $(SIGPROXY_EXE) $(DOCKERTLSARGS_EXE) $(DOCKERPLUGIN_EXE):
|
$(WEAVEWAIT_EXE) $(SIGPROXY_EXE) $(DOCKERTLSARGS_EXE) $(DOCKERPLUGIN_EXE) $(TEST_TLS_EXE):
|
||||||
go get -tags netgo ./$(@D)
|
go get -tags netgo ./$(@D)
|
||||||
go build $(BUILD_FLAGS) -o $@ ./$(@D)
|
go build $(BUILD_FLAGS) -o $@ ./$(@D)
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -6,7 +6,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
|
|||||||
|
|
||||||
. ./config.sh
|
. ./config.sh
|
||||||
|
|
||||||
(cd ./tls && go get -tags netgo ./... && go run generate_certs.go $HOSTS)
|
(cd ./tls && ./tls $HOSTS)
|
||||||
|
|
||||||
echo "Copying weave images, scripts, and certificates to hosts, and"
|
echo "Copying weave images, scripts, and certificates to hosts, and"
|
||||||
echo " prefetch test images"
|
echo " prefetch test images"
|
||||||
@@ -19,7 +19,7 @@ setup_host() {
|
|||||||
run_on $HOST mkdir -p bin
|
run_on $HOST mkdir -p bin
|
||||||
upload_executable $HOST ../bin/docker-ns
|
upload_executable $HOST ../bin/docker-ns
|
||||||
upload_executable $HOST ../weave
|
upload_executable $HOST ../weave
|
||||||
rsync -az -e "$SSH" ./tls/ $HOST:~/tls
|
rsync -az -e "$SSH" --exclude=tls ./tls/ $HOST:~/tls
|
||||||
for IMG in $TEST_IMAGES ; do
|
for IMG in $TEST_IMAGES ; do
|
||||||
docker_on $HOST inspect --format=" " $IMG >/dev/null 2>&1 || docker_on $HOST pull $IMG
|
docker_on $HOST inspect --format=" " $IMG >/dev/null 2>&1 || docker_on $HOST pull $IMG
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in new issue
Block a user