From 0a3c58b641276c1a1dfc2d9b9d16de527c892e72 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 23 Feb 2017 21:10:52 +0000
Subject: [PATCH 1/3] Pin the version of Weave Net embedded

for more repeatable builds
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1d50d1626..fee557ecf 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ SCOPE_UI_BUILD_UPTODATE=.scope_ui_build.uptodate
 SCOPE_BACKEND_BUILD_IMAGE=$(DOCKERHUB_USER)/scope-backend-build
 SCOPE_BACKEND_BUILD_UPTODATE=.scope_backend_build.uptodate
 SCOPE_VERSION=$(shell git rev-parse --short HEAD)
+WEAVENET_VERSION=1.9.0
 DOCKER_VERSION=1.10.3
 DOCKER_DISTRIB=.pkg/docker-$(DOCKER_VERSION).tgz
 DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(DOCKER_VERSION).tgz
@@ -38,7 +39,7 @@ $(DOCKER_DISTRIB):
 	curl -o $(DOCKER_DISTRIB) $(DOCKER_DISTRIB_URL)
 
 docker/weave:
-	curl -L git.io/weave -o docker/weave
+	curl -L https://github.com/weaveworks/weave/releases/download/v$(WEAVENET_VERSION)/weave -o docker/weave
 	chmod u+x docker/weave
 
 $(SCOPE_EXPORT): $(SCOPE_EXE) $(DOCKER_DISTRIB) docker/weave $(RUNSVINIT) docker/Dockerfile docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh

From a60192d98a68b4d01121c8eae8cd74dbc867bd16 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 23 Feb 2017 21:12:01 +0000
Subject: [PATCH 2/3] Install weaveutil so we don't have to run it via docker

---
 .gitignore        | 1 +
 Makefile          | 8 +++++++-
 docker/Dockerfile | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3881ffc48..0e2686320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ prog/scope
 docker/scope
 docker/docker.tgz
 docker/weave
+docker/weaveutil
 docker/runsvinit
 extras/fixprobe/fixprobe
 extras/fixprobe/*.json
diff --git a/Makefile b/Makefile
index fee557ecf..09750c6ae 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,13 @@ docker/weave:
 	curl -L https://github.com/weaveworks/weave/releases/download/v$(WEAVENET_VERSION)/weave -o docker/weave
 	chmod u+x docker/weave
 
-$(SCOPE_EXPORT): $(SCOPE_EXE) $(DOCKER_DISTRIB) docker/weave $(RUNSVINIT) docker/Dockerfile docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh
+docker/weaveutil:
+	docker pull weaveworks/weaveexec:$(WEAVENET_VERSION)
+	docker create --name=throwaway weaveworks/weaveexec:$(WEAVENET_VERSION)
+	docker cp throwaway:/usr/bin/weaveutil docker/weaveutil
+	docker rm throwaway
+
+$(SCOPE_EXPORT): $(SCOPE_EXE) $(DOCKER_DISTRIB) docker/weave docker/weaveutil $(RUNSVINIT) docker/Dockerfile docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh
 	cp $(SCOPE_EXE) $(RUNSVINIT) docker/
 	cp $(DOCKER_DISTRIB) docker/docker.tgz
 	$(SUDO) docker build -t $(SCOPE_IMAGE) docker/
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a6d31a75b..2b16eb272 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --update bash runit conntrack-tools iproute2 util-linux curl && \
 	rm -rf /var/cache/apk/*
 ADD ./docker.tgz /
 ADD ./demo.json /
-ADD ./weave /usr/bin/
+ADD ./weave ./weaveutil /usr/bin/
 COPY ./scope ./runsvinit ./entrypoint.sh /home/weave/
 COPY ./run-app /etc/service/app/run
 COPY ./run-probe /etc/service/probe/run

From 9c2009f63e70d196823e6f02688468321e8542d3 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@weave.works>
Date: Fri, 24 Feb 2017 11:03:02 +0000
Subject: [PATCH 3/3] Simplify copying of weaveutil

---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 09750c6ae..d8b542528 100644
--- a/Makefile
+++ b/Makefile
@@ -43,10 +43,8 @@ docker/weave:
 	chmod u+x docker/weave
 
 docker/weaveutil:
-	docker pull weaveworks/weaveexec:$(WEAVENET_VERSION)
-	docker create --name=throwaway weaveworks/weaveexec:$(WEAVENET_VERSION)
-	docker cp throwaway:/usr/bin/weaveutil docker/weaveutil
-	docker rm throwaway
+	$(SUDO) docker run --rm  --entrypoint=cat weaveworks/weaveexec:$(WEAVENET_VERSION) /usr/bin/weaveutil > $@
+	chmod +x $@
 
 $(SCOPE_EXPORT): $(SCOPE_EXE) $(DOCKER_DISTRIB) docker/weave docker/weaveutil $(RUNSVINIT) docker/Dockerfile docker/demo.json docker/run-app docker/run-probe docker/entrypoint.sh
 	cp $(SCOPE_EXE) $(RUNSVINIT) docker/