reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2905 from weaveworks/remove-docker-from-plugin

Browse Source 
Remove some things we don't want in the v2 plugin image
This commit is contained in:
Marc Carré authored and GitHub committed 2017-04-21 11:12:28 +01:00
2 parents 7d812e3087 05d9cf8235
commit bfe8e79653
1 file changed
+2
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2
View File
@@ -274,6 +274,8 @@ $(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/weaveproxy $(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