cosmetic: consistency in launchers

weave

@@ -844,7 +844,9 @@ case "$COMMAND" in
         # additional parameters, such as resource limits, to docker
         # when launching the weave container.
         CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME \
-            -p $PORT:$CONTAINER_PORT/tcp -p $PORT:$CONTAINER_PORT/udp -e WEAVE_PASSWORD -v /var/run/docker.sock:/var/run/docker.sock \
+            -p $PORT:$CONTAINER_PORT/tcp -p $PORT:$CONTAINER_PORT/udp \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            -e WEAVE_PASSWORD \
             $WEAVE_DOCKER_ARGS $IMAGE -iface $CONTAINER_IFNAME -port $CONTAINER_PORT -name "$PEERNAME" -nickname "$(hostname)" $IPRANGE "$@")
         with_container_netns_or_die $CONTAINER launch
         wait_for_status $CONTAINER_NAME $HTTP_PORT
@@ -866,7 +868,8 @@ case "$COMMAND" in
         # additional parameters, such as resource limits, to docker
         # when launching the weave container.
         DNS_CONTAINER=$(docker run --privileged -d --name=$DNS_CONTAINER_NAME \
-            -p $DOCKER_BRIDGE_IP:53:53/udp -v /var/run/docker.sock:/var/run/docker.sock \
+            -p $DOCKER_BRIDGE_IP:53:53/udp \
+            -v /var/run/docker.sock:/var/run/docker.sock \
             $WEAVEDNS_DOCKER_ARGS $DNS_IMAGE -iface $CONTAINER_IFNAME "$@")
         with_container_netns_or_die $DNS_CONTAINER attach $CIDR
         populate_dns
@@ -877,14 +880,12 @@ case "$COMMAND" in
         # Set WEAVEPROXY_DOCKER_ARGS in the environment in order to supply
         # additional parameters, such as resource limits, to docker
         # when launching the weaveproxy container.
-        PROXY_CONTAINER=$(docker run --privileged --net=host -d \
-            --name=$PROXY_CONTAINER_NAME \
+        PROXY_CONTAINER=$(docker run --privileged -d --name=$PROXY_CONTAINER_NAME --net=host \
             -p $PROXY_PORT:$PROXY_PORT/tcp \
-            -v /var/run/docker.sock:/var/run/docker.sock \
-            -v /proc:/hostproc -e PROCFS=/hostproc \
+            -v /var/run/docker.sock:/var/run/docker.sock -v /proc:/hostproc \
+            -e PROCFS=/hostproc \
             --entrypoint=/home/weave/weaveproxy \
-            $WEAVEPROXY_DOCKER_ARGS \
-            $EXEC_IMAGE "$@")
+            $WEAVEPROXY_DOCKER_ARGS $EXEC_IMAGE "$@")
         wait_for_status_ip $PROXY_CONTAINER_NAME 127.0.0.1 $PROXY_PORT
         echo $PROXY_CONTAINER
         ;;