Merge pull request #858 from weaveworks/0.11

Respect `DOCKER_CLIENT_ARGS` in `weave run`
This commit is contained in:
Matthias Radestock committed 2015-06-05 13:36:27 +01:00
commit 3e8813e559
1 file changed
+1 -1
+1 -1
View File
@@ -143,7 +143,7 @@ if [ "$1" = "run" ] ; then
fi
collect_cidr_args "$@"
shift $CIDR_COUNT
CONTAINER=$(docker run $DNS_ARGS -d "$@")
CONTAINER=$(docker $DOCKER_CLIENT_ARGS run $DNS_ARGS -d "$@")
exec_remote attach $CIDR_ARGS $CONTAINER
echo $CONTAINER
exit 0