From 98c4bd9ee545354f2f4582a8a3d77bd1602f5fe3 Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Wed, 17 May 2017 12:45:20 +0300 Subject: [PATCH] Do not remove sigproxy and docker from net-plugin build img The #2954 PR has changed the base image of weaveworks/weave which no longer includes sigproxy and docker client. --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index cab30071..052b1fef 100644 --- a/Makefile +++ b/Makefile @@ -274,8 +274,6 @@ $(PLUGIN_UPTODATE): prog/net-plugin/launch.sh prog/net-plugin/config.json $(WEAV mkdir $(PLUGIN_WORK_DIR) $(SUDO) docker export $(PLUGIN_BUILD_IMG) | tar -x -C $(PLUGIN_WORK_DIR) $(SUDO) docker rm -f $(PLUGIN_BUILD_IMG) -# get rid of a few bulky things we don't need in the v2 plugin image - rm $(PLUGIN_WORK_DIR)/home/weave/sigproxy $(PLUGIN_WORK_DIR)/usr/bin/docker cp prog/net-plugin/launch.sh $(PLUGIN_WORK_DIR)/home/weave/launch.sh -$(SUDO) docker plugin disable $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null -$(SUDO) docker plugin rm $(PLUGIN_IMAGE):$(WEAVE_VERSION) 2>/dev/null