From bdfa06dbe97f73bc18ef4a262e787b9cb2d41b38 Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Tue, 11 Apr 2017 22:07:13 +0100 Subject: [PATCH] Use $(SUDO) for each docker cmd when building net-plugin --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d563ec12..7b1bac40 100644 --- a/Makefile +++ b/Makefile @@ -272,15 +272,15 @@ $(PLUGIN_UPTODATE): prog/net-plugin/launch.sh prog/net-plugin/config.json $(WEAV $(SUDO) docker create --name=$(PLUGIN_BUILD_IMG) $(WEAVER_IMAGE) true rm -rf $(PLUGIN_WORK_DIR) mkdir $(PLUGIN_WORK_DIR) - docker export $(PLUGIN_BUILD_IMG) | tar -x -C $(PLUGIN_WORK_DIR) - docker rm -f $(PLUGIN_BUILD_IMG) + $(SUDO) docker export $(PLUGIN_BUILD_IMG) | tar -x -C $(PLUGIN_WORK_DIR) + $(SUDO) docker rm -f $(PLUGIN_BUILD_IMG) cp prog/net-plugin/launch.sh $(PLUGIN_WORK_DIR)/home/weave/launch.sh - -docker plugin disable $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null - -docker plugin rm $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null - docker plugin create $(PLUGIN_IMAGE):$(WEAVE_VERSION) prog/net-plugin - -docker plugin disable $(PLUGIN_IMAGE):latest 2>/dev/null - -docker plugin rm $(PLUGIN_IMAGE):latest 2>/dev/null - docker plugin create $(PLUGIN_IMAGE):latest prog/net-plugin + -$(SUDO) docker plugin disable $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null + -$(SUDO) docker plugin rm $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null + $(SUDO) docker plugin create $(PLUGIN_IMAGE):$(WEAVE_VERSION) prog/net-plugin + -$(SUDO) docker plugin disable $(PLUGIN_IMAGE):latest 2>/dev/null + -$(SUDO) docker plugin rm $(PLUGIN_IMAGE):latest 2>/dev/null + $(SUDO) docker plugin create $(PLUGIN_IMAGE):latest prog/net-plugin touch $@ $(WEAVEKUBE_UPTODATE): prog/weave-kube/Dockerfile.$(DOCKERHUB_USER) prog/weave-kube/launch.sh $(KUBEPEERS_EXE) $(WEAVER_UPTODATE)