From 09628178e4a4f1accb3e2128a5d3100023155fc8 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 3 Nov 2016 10:05:28 +0000
Subject: [PATCH] Weave-kube doesn't need to depend on plugin repo any more

---
 Makefile                            | 2 +-
 prog/weave-kube/Dockerfile.template | 2 +-
 prog/weave-kube/launch.sh           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8aeea2af..42f10d2b 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ $(PLUGIN_UPTODATE): prog/plugin/Dockerfile.$(DOCKERHUB_USER) $(PLUGIN_EXE) $(WEA
 	$(SUDO) docker build -f prog/plugin/Dockerfile.$(DOCKERHUB_USER) -t $(PLUGIN_IMAGE) prog/plugin
 	touch $@
 
-$(WEAVEKUBE_UPTODATE): prog/weave-kube/Dockerfile.$(DOCKERHUB_USER) prog/weave-kube/launch.sh $(KUBEPEERS_EXE) $(PLUGIN_UPTODATE)
+$(WEAVEKUBE_UPTODATE): prog/weave-kube/Dockerfile.$(DOCKERHUB_USER) prog/weave-kube/launch.sh $(KUBEPEERS_EXE) $(WEAVER_UPTODATE)
 	cp $(KUBEPEERS_EXE) prog/weave-kube/
 	$(SUDO) docker build -f prog/weave-kube/Dockerfile.$(DOCKERHUB_USER) -t $(WEAVEKUBE_IMAGE) prog/weave-kube
 	touch $@
diff --git a/prog/weave-kube/Dockerfile.template b/prog/weave-kube/Dockerfile.template
index bb4f8cb5..0831985f 100644
--- a/prog/weave-kube/Dockerfile.template
+++ b/prog/weave-kube/Dockerfile.template
@@ -1,3 +1,3 @@
-FROM DOCKERHUB_USER/plugin
+FROM DOCKERHUB_USER/weave
 ADD ./launch.sh ./kube-peers /home/weave/
 ENTRYPOINT ["/home/weave/launch.sh"]
diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
index 29e63be1..188f9d83 100755
--- a/prog/weave-kube/launch.sh
+++ b/prog/weave-kube/launch.sh
@@ -31,8 +31,8 @@ fi
 
 install_cni_plugin() {
     mkdir -p $1 || return 1
-    cp /home/weave/plugin $1/weave-net
-    cp /home/weave/plugin $1/weave-ipam
+    cp /usr/bin/weaveutil $1/weave-net
+    cp /usr/bin/weaveutil $1/weave-ipam
 }
 
 # Install CNI plugin binary to typical CNI bin location