From 9c2009f63e70d196823e6f02688468321e8542d3 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Fri, 24 Feb 2017 11:03:02 +0000 Subject: [PATCH] Simplify copying of weaveutil --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 09750c6ae6..d8b5425284 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/