From 8d4a97fed53657ef57a01c72e7ae66233a465b6f Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 2 Jun 2015 13:19:16 +0100 Subject: [PATCH 1/4] move sigproxy, weaveproxy, weavewait --- .gitignore | 6 +++--- Makefile | 12 ++++++------ {sigproxy => prog/sigproxy}/main.go | 0 {weaveproxy => prog/weaveproxy}/main.go | 0 {weavewait => prog/weavewait}/main.go | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename {sigproxy => prog/sigproxy}/main.go (100%) rename {weaveproxy => prog/weaveproxy}/main.go (100%) rename {weavewait => prog/weavewait}/main.go (100%) diff --git a/.gitignore b/.gitignore index 6f39f896..4eae9f53 100644 --- a/.gitignore +++ b/.gitignore @@ -32,9 +32,9 @@ coverage.html # Project specific weaver/weaver weavedns/weavedns -weaveproxy/weaveproxy -sigproxy/sigproxy -weavewait/weavewait +prog/weaveproxy/weaveproxy +prog/sigproxy/sigproxy +prog/weavewait/weavewait tools/bin tools/build releases diff --git a/Makefile b/Makefile index b2df6efd..4a11117f 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD) WEAVER_EXE=weaver/weaver WEAVEDNS_EXE=weavedns/weavedns -WEAVEPROXY_EXE=weaveproxy/weaveproxy -SIGPROXY_EXE=sigproxy/sigproxy -WEAVEWAIT_EXE=weavewait/weavewait +WEAVEPROXY_EXE=prog/weaveproxy/weaveproxy +SIGPROXY_EXE=prog/sigproxy/sigproxy +WEAVEWAIT_EXE=prog/weavewait/weavewait EXES=$(WEAVER_EXE) $(WEAVEDNS_EXE) $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) @@ -54,12 +54,12 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE): common/*.go co $(WEAVER_EXE): router/*.go ipam/*.go ipam/*/*.go weaver/main.go $(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go -$(WEAVEPROXY_EXE): proxy/*.go weaveproxy/main.go -$(WEAVEWAIT_EXE): weavewait/*.go weavewait/main.go +$(WEAVEPROXY_EXE): proxy/*.go prog/weaveproxy/main.go +$(WEAVEWAIT_EXE): prog/weavewait/*.go # Sigproxy needs separate rule as it fails the netgo check in the main # build stanza due to not importing net package -$(SIGPROXY_EXE): sigproxy/main.go +$(SIGPROXY_EXE): prog/sigproxy/main.go go build -o $@ ./$(@D) $(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE) diff --git a/sigproxy/main.go b/prog/sigproxy/main.go similarity index 100% rename from sigproxy/main.go rename to prog/sigproxy/main.go diff --git a/weaveproxy/main.go b/prog/weaveproxy/main.go similarity index 100% rename from weaveproxy/main.go rename to prog/weaveproxy/main.go diff --git a/weavewait/main.go b/prog/weavewait/main.go similarity index 100% rename from weavewait/main.go rename to prog/weavewait/main.go From ee28cf91e18d1f318a4b7f8923a3628615ccd7e1 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 2 Jun 2015 13:46:02 +0100 Subject: [PATCH 2/4] move weaveexec --- .gitignore | 10 +++++----- Makefile | 16 ++++++++-------- {weaveexec => prog/weaveexec}/Dockerfile | 0 3 files changed, 13 insertions(+), 13 deletions(-) rename {weaveexec => prog/weaveexec}/Dockerfile (100%) diff --git a/.gitignore b/.gitignore index 4eae9f53..b289ff9c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,9 +41,9 @@ releases weave.tar weavedns.tar weaveexec.tar -weaveexec/weave -weaveexec/weaveproxy -weaveexec/weavewait -weaveexec/sigproxy -weaveexec/docker*.tgz +prog/weaveexec/weave +prog/weaveexec/weaveproxy +prog/weaveexec/weavewait +prog/weaveexec/sigproxy +prog/weaveexec/docker*.tgz Vagrantfile.local diff --git a/Makefile b/Makefile index 4a11117f..f17838e5 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ WEAVEEXEC_EXPORT=weaveexec.tar EXPORTS=$(WEAVER_EXPORT) $(WEAVEDNS_EXPORT) $(WEAVEEXEC_EXPORT) WEAVEEXEC_DOCKER_VERSION=1.3.1 -DOCKER_DISTRIB=weaveexec/docker-$(WEAVEEXEC_DOCKER_VERSION).tgz +DOCKER_DISTRIB=prog/weaveexec/docker-$(WEAVEEXEC_DOCKER_VERSION).tgz DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(WEAVEEXEC_DOCKER_VERSION).tgz all: $(EXPORTS) @@ -70,13 +70,13 @@ $(WEAVEDNS_EXPORT): weavedns/Dockerfile $(WEAVEDNS_EXE) $(SUDO) docker build -t $(WEAVEDNS_IMAGE) weavedns $(SUDO) docker save $(WEAVEDNS_IMAGE):latest > $@ -$(WEAVEEXEC_EXPORT): weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) - cp weave weaveexec/weave - cp $(SIGPROXY_EXE) weaveexec/sigproxy - cp $(WEAVEPROXY_EXE) weaveexec/weaveproxy - cp $(WEAVEWAIT_EXE) weaveexec/weavewait - cp $(DOCKER_DISTRIB) weaveexec/docker.tgz - $(SUDO) docker build -t $(WEAVEEXEC_IMAGE) weaveexec +$(WEAVEEXEC_EXPORT): prog/weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) + cp weave prog/weaveexec/weave + cp $(SIGPROXY_EXE) prog/weaveexec/sigproxy + cp $(WEAVEPROXY_EXE) prog/weaveexec/weaveproxy + cp $(WEAVEWAIT_EXE) prog/weaveexec/weavewait + cp $(DOCKER_DISTRIB) prog/weaveexec/docker.tgz + $(SUDO) docker build -t $(WEAVEEXEC_IMAGE) prog/weaveexec $(SUDO) docker save $(WEAVEEXEC_IMAGE):latest > $@ $(DOCKER_DISTRIB): diff --git a/weaveexec/Dockerfile b/prog/weaveexec/Dockerfile similarity index 100% rename from weaveexec/Dockerfile rename to prog/weaveexec/Dockerfile From 485db6e48b78d9d12aa4f87a861d6267305cda53 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 2 Jun 2015 13:51:19 +0100 Subject: [PATCH 3/4] move weavedns --- .gitignore | 2 +- Makefile | 8 ++++---- {weavedns => prog/weavedns}/Dockerfile | 0 {weavedns => prog/weavedns}/main.go | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename {weavedns => prog/weavedns}/Dockerfile (100%) rename {weavedns => prog/weavedns}/main.go (100%) diff --git a/.gitignore b/.gitignore index b289ff9c..5181a3b4 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ coverage.html # Project specific weaver/weaver -weavedns/weavedns +prog/weavedns/weavedns prog/weaveproxy/weaveproxy prog/sigproxy/sigproxy prog/weavewait/weavewait diff --git a/Makefile b/Makefile index f17838e5..0576f103 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ DOCKERHUB_USER=weaveworks WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD) WEAVER_EXE=weaver/weaver -WEAVEDNS_EXE=weavedns/weavedns +WEAVEDNS_EXE=prog/weavedns/weavedns WEAVEPROXY_EXE=prog/weaveproxy/weaveproxy SIGPROXY_EXE=prog/sigproxy/sigproxy WEAVEWAIT_EXE=prog/weavewait/weavewait @@ -53,7 +53,7 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE): common/*.go co } $(WEAVER_EXE): router/*.go ipam/*.go ipam/*/*.go weaver/main.go -$(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go +$(WEAVEDNS_EXE): nameserver/*.go prog/weavedns/main.go $(WEAVEPROXY_EXE): proxy/*.go prog/weaveproxy/main.go $(WEAVEWAIT_EXE): prog/weavewait/*.go @@ -66,8 +66,8 @@ $(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE) $(SUDO) docker build -t $(WEAVER_IMAGE) weaver $(SUDO) docker save $(WEAVER_IMAGE):latest > $@ -$(WEAVEDNS_EXPORT): weavedns/Dockerfile $(WEAVEDNS_EXE) - $(SUDO) docker build -t $(WEAVEDNS_IMAGE) weavedns +$(WEAVEDNS_EXPORT): prog/weavedns/Dockerfile $(WEAVEDNS_EXE) + $(SUDO) docker build -t $(WEAVEDNS_IMAGE) prog/weavedns $(SUDO) docker save $(WEAVEDNS_IMAGE):latest > $@ $(WEAVEEXEC_EXPORT): prog/weaveexec/Dockerfile $(DOCKER_DISTRIB) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) diff --git a/weavedns/Dockerfile b/prog/weavedns/Dockerfile similarity index 100% rename from weavedns/Dockerfile rename to prog/weavedns/Dockerfile diff --git a/weavedns/main.go b/prog/weavedns/main.go similarity index 100% rename from weavedns/main.go rename to prog/weavedns/main.go From 5b04efac7c1c89df010d93bb6c8642b168a2ad3d Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 2 Jun 2015 14:04:02 +0100 Subject: [PATCH 4/4] move weaver --- .gitignore | 2 +- Makefile | 8 ++++---- bin/release | 2 +- {weaver => prog/weaver}/Dockerfile | 0 {weaver => prog/weaver}/main.go | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename {weaver => prog/weaver}/Dockerfile (100%) rename {weaver => prog/weaver}/main.go (100%) diff --git a/.gitignore b/.gitignore index 5181a3b4..40c314a9 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ coverage.html *~ # Project specific -weaver/weaver +prog/weaver/weaver prog/weavedns/weavedns prog/weaveproxy/weaveproxy prog/sigproxy/sigproxy diff --git a/Makefile b/Makefile index 0576f103..316e1eb5 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SUDO=sudo DOCKERHUB_USER=weaveworks WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD) -WEAVER_EXE=weaver/weaver +WEAVER_EXE=prog/weaver/weaver WEAVEDNS_EXE=prog/weavedns/weavedns WEAVEPROXY_EXE=prog/weaveproxy/weaveproxy SIGPROXY_EXE=prog/sigproxy/sigproxy @@ -52,7 +52,7 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE): common/*.go co false; \ } -$(WEAVER_EXE): router/*.go ipam/*.go ipam/*/*.go weaver/main.go +$(WEAVER_EXE): router/*.go ipam/*.go ipam/*/*.go prog/weaver/main.go $(WEAVEDNS_EXE): nameserver/*.go prog/weavedns/main.go $(WEAVEPROXY_EXE): proxy/*.go prog/weaveproxy/main.go $(WEAVEWAIT_EXE): prog/weavewait/*.go @@ -62,8 +62,8 @@ $(WEAVEWAIT_EXE): prog/weavewait/*.go $(SIGPROXY_EXE): prog/sigproxy/main.go go build -o $@ ./$(@D) -$(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE) - $(SUDO) docker build -t $(WEAVER_IMAGE) weaver +$(WEAVER_EXPORT): prog/weaver/Dockerfile $(WEAVER_EXE) + $(SUDO) docker build -t $(WEAVER_IMAGE) prog/weaver $(SUDO) docker save $(WEAVER_IMAGE):latest > $@ $(WEAVEDNS_EXPORT): prog/weavedns/Dockerfile $(WEAVEDNS_EXE) diff --git a/bin/release b/bin/release index 664f5041..2e34a3f1 100755 --- a/bin/release +++ b/bin/release @@ -61,7 +61,7 @@ build() { fi ## Run tests with the distributables, including version check - v=$(./weaver/weaver --version | grep -o '[0-9].*') + v=$(./prog/weaver/weaver --version | grep -o '[0-9].*') if ! [ "$v" == "$VERSION" ]; then echo "Version of distributable "$v" does not match release version $VERSION" >&2 exit 1 diff --git a/weaver/Dockerfile b/prog/weaver/Dockerfile similarity index 100% rename from weaver/Dockerfile rename to prog/weaver/Dockerfile diff --git a/weaver/main.go b/prog/weaver/main.go similarity index 100% rename from weaver/main.go rename to prog/weaver/main.go