From 5860332e49cf3233e2d516f0f995cef38c61b9a4 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 30 Jan 2017 15:14:43 +0000 Subject: [PATCH 1/2] Don't repeat '--privileged --net=host' docker options --- weave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weave b/weave index 68d589ef..06c812dc 100755 --- a/weave +++ b/weave @@ -499,7 +499,7 @@ util_op() { if command_exists weaveutil ; then weaveutil "$@" else - docker run --rm --privileged --net=host --pid=host $(docker_sock_options) \ + docker run --rm --pid=host $(docker_run_options) \ --entrypoint=/usr/bin/weaveutil $EXEC_IMAGE "$@" fi } From ca523fa335b1ddcd50b0f17b472ad8ae9f1a7312 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 30 Jan 2017 17:48:15 +0000 Subject: [PATCH 2/2] Don't need --privileged when writing /etc/hosts --- weave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weave b/weave index 06c812dc..dd12f351 100755 --- a/weave +++ b/weave @@ -1187,7 +1187,7 @@ rewrite_etc_hosts() { CONTENTS="$(etc_hosts_contents $FQDN "$@")" # rewrite /etc/hosts, unlinking the file (so Docker does not modify it again) but # leaving it with valid contents... - docker run --rm --net=none -e WEAVE_CIDR=none --privileged \ + docker run --rm --net=none -e WEAVE_CIDR=none \ -v $CONTAINERS_PATH:$MNT \ --entrypoint=sh \ $EXEC_IMAGE -c "echo '$CONTENTS' > $MNT_HOSTS && rm -f $MNT_HOSTS && echo '$CONTENTS' > $MNT_HOSTS"