Weave-kube doesn't need to depend on plugin repo any more

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 $@

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"]

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