From f8e2af32cd542e3e370bc2bac0529a02614f9e72 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 8 Mar 2016 23:10:19 +0000
Subject: [PATCH] refactor: extract common docker run options

---
 weave | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/weave b/weave
index 1f7259cc..afd133cc 100755
--- a/weave
+++ b/weave
@@ -111,8 +111,14 @@ docker_sock_options() {
     fi
 }
 
+docker_run_options() {
+    echo --privileged --net=host $(docker_sock_options)
+}
+
 exec_remote() {
-    docker $DOCKER_CLIENT_ARGS run --rm --privileged --net=host --pid=host $(docker_sock_options) \
+    docker $DOCKER_CLIENT_ARGS run --rm \
+        $(docker_run_options) \
+        --pid=host \
         -e DOCKERHUB_USER="$DOCKERHUB_USER" \
         -e WEAVE_VERSION \
         -e WEAVE_DEBUG \
@@ -1620,7 +1626,7 @@ launch_router() {
     # additional parameters, such as resource limits, to docker
     # when launching the weave container.
     start_if_necessary router $CONTAINER_NAME $IMAGE \
-        --privileged --net=host $(docker_sock_options) \
+        $(docker_run_options) \
         -e WEAVE_PASSWORD \
         -e CHECKPOINT_DISABLE \
         $WEAVE_DOCKER_ARGS $IMAGE $COVERAGE_ARGS \
@@ -1676,7 +1682,8 @@ launch_proxy() {
            --label=weavevolumes --entrypoint=/bin/false $EXEC_IMAGE >/dev/null
     fi
     start_if_necessary proxy $PROXY_CONTAINER_NAME $EXEC_IMAGE \
-        --privileged --net=host --pid=host $(docker_sock_options) \
+        $(docker_run_options) \
+        --pid=host \
         $PROXY_VOLUMES \
         --volumes-from $VOLUMES_CONTAINER_NAME \
         -v /var/run/weave:/var/run/weave \
@@ -1697,7 +1704,7 @@ stop_proxy() {
 
 launch_plugin_if_not_running() {
     start_if_necessary plugin $PLUGIN_CONTAINER_NAME $PLUGIN_IMAGE \
-        --privileged --net=host $(docker_sock_options) \
+        $(docker_run_options) \
         --restart=always \
         -v /run/docker/plugins:/run/docker/plugins \
         -e WEAVE_HTTP_ADDR \