move plugin network removal into weaveutil

This does require starting containerised weaveutil with docker.sock
volume mounts.
This commit is contained in:
Matthias Radestock committed 2016-01-15 07:58:21 +00:00
1 parent 8061ea4079
commit 9578798ec0
4 files changed
+48 -21

No files matched your search

+4 -9
View File
@@ -448,7 +448,8 @@ util_op() {
if command_exists weaveutil ; then
weaveutil "$@"
else
docker run --rm --privileged --net=host -v /proc:/hostproc -e PROCFS=/hostproc \
docker run --rm --privileged --net=host $(docker_sock_options) \
-v /proc:/hostproc -e PROCFS=/hostproc \
--entrypoint=/usr/bin/weaveutil $EXEC_IMAGE "$@"
fi
}
@@ -1694,14 +1695,8 @@ plugin_disabled() {
[ -n "$WEAVE_NO_PLUGIN" ] || ! check_docker_server_api_version 1.21
}
remove_plugin_network() {
docker run --rm --net=host \
-v /var/run/docker.sock:/var/run/docker.sock \
$PLUGIN_IMAGE --remove-network
}
stop_plugin() {
remove_plugin_network
util_op remove-plugin-network weave
stop $PLUGIN_CONTAINER_NAME "Plugin"
}
@@ -2137,7 +2132,7 @@ EOF
;;
reset)
[ $# -eq 0 ] || usage
plugin_disabled || remove_plugin_network || \
plugin_disabled || util_op remove-plugin-network weave || \
echo "WARNING: docker may hang in this state; re-launch weave and remove attached containers before shutting down" >&2
warn_if_stopping_proxy_in_env
call_weave DELETE /peer >/dev/null 2>&1 || true