From d4a2bc80247ab220527bb693d5c9c721d0621f61 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 7 Oct 2014 22:22:21 +0100 Subject: [PATCH] document WEAVE_DOCKER_ARGS --- weaver/weave | 3 +++ 1 file changed, 3 insertions(+) diff --git a/weaver/weave b/weaver/weave index f2aaa24f..1b18d8b5 100755 --- a/weaver/weave +++ b/weaver/weave @@ -256,6 +256,9 @@ case "$COMMAND" in # (eth0, wlan0, etc) so the name becomes stable across host # restarts. MACADDR=`cat /sys/class/net/$BRIDGE/address` + # Set WEAVE_DOCKER_ARGS in the environment in order to supply + # additional parameters, such as resource limits, to docker + # when launching the weave container. CONTAINER=$(docker run --privileged -d --name=weave -p 6783:6783/tcp -p 6783:6783/udp $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR "$@") with_container_netns attach $CONTAINER $IPADDR eth0 echo $CONTAINER