Skip to content
This repository was archived by the owner on Jun 20, 2024. It is now read-only.

pass common launch args to all three components #1072

Merged
merged 1 commit into from
Jul 6, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions weave
Original file line number Diff line number Diff line change
Expand Up @@ -946,6 +946,18 @@ proxy_addr() {
# launch helpers
######################################################################

common_launch_args() {
args=""
while [ $# -gt 0 ] ; do
case "$1" in
--log-level=*)
args="$args $1"
esac
shift
done
echo "$args"
}

launch_router() {
create_bridge
# We set the router name to the bridge mac since that is
Expand Down Expand Up @@ -1113,9 +1125,10 @@ case "$COMMAND" in
check_not_running $CONTAINER_NAME $BASE_IMAGE
check_not_running $DNS_CONTAINER_NAME $BASE_DNS_IMAGE
check_not_running $PROXY_CONTAINER_NAME $EXEC_IMAGE
COMMON_ARGS=$(common_launch_args "$@")
launch_router "$@"
launch_dns
launch_proxy
launch_dns $COMMON_ARGS
launch_proxy $COMMON_ARGS
;;
launch-router)
check_not_running $CONTAINER_NAME $BASE_IMAGE
Expand Down