From 833fcce792b833115ca0af4c488739e6e432e862 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Thu, 8 Jan 2015 13:08:57 +0000 Subject: [PATCH] Use WEAVE_PASSWORD environment variable, if no args supplied --- weave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weave b/weave index 53f9aee8..7eee3689 100755 --- a/weave +++ b/weave @@ -483,7 +483,7 @@ case "$COMMAND" in # when launching the weave container. CONTAINER=$(docker run --privileged -d --name=$CONTAINER_NAME \ -p $PORT:$PORT/tcp -p $PORT:$PORT/udp \ - $PASSWORD_ARGS \ + ${PASSWORD_ARGS:-"-e WEAVE_PASSWORD"} \ $WEAVE_DOCKER_ARGS $IMAGE -name $MACADDR -iface $CONTAINER_IFNAME "$@") with_container_netns $CONTAINER launch >/dev/null echo $CONTAINER