Use WEAVE_PASSWORD environment variable, if no args supplied

This commit is contained in:
Ilya Dmitrichenko committed 2015-01-08 17:08:35 +00:00
1 parent 5cbc4fa33d
commit 833fcce792
1 file changed
+1 -1
+1 -1
View File
@@ -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