Merge pull request #1817 from weaveworks/1815-docker-version
Check we have Docker 1.9 or newer before trying to remove a network Fixes #1815.
This commit is contained in:
commit
2ed4b45c24
1 file changed
+5
-3
@@ -1704,9 +1704,11 @@ launch_plugin() {
|
||||
}
|
||||
|
||||
remove_plugin_network() {
|
||||
docker run --rm --net=host \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
$PLUGIN_IMAGE --remove-network
|
||||
if [ -z $WEAVE_NO_PLUGIN ] && check_docker_server_api_version 1.21 ; then
|
||||
docker run --rm --net=host \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
$PLUGIN_IMAGE --remove-network
|
||||
fi
|
||||
}
|
||||
|
||||
stop_plugin() {
|
||||
|
||||
Reference in new issue
Block a user