Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

only pass WEAVESCOPE_DOCKER_ARGS to actual probe/app start #2715

Merged
merged 3 commits into from
Jul 20, 2017
Merged

only pass WEAVESCOPE_DOCKER_ARGS to actual probe/app start #2715

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e19c33b
only pass WEAVESCOPE_DOCKER_ARGS to actual probe/app start
rade Jul 14, 2017
bf8b28c
no need to pass CHECKPOINT_DISABLE when not starting probe/app
rade Jul 14, 2017
86c9544
remove superfluous shellchecks
rade Jul 14, 2017
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
18 changes: 5 additions & 13 deletions scope
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ usage() {

Launch options:
EOF
# shellcheck disable=SC2086
docker run --rm -e CHECKPOINT_DISABLE --entrypoint=/home/weave/scope \
$WEAVESCOPE_DOCKER_ARGS "$SCOPE_IMAGE" -h >&2
docker run --rm --entrypoint=/home/weave/scope "$SCOPE_IMAGE" -h >&2
}

usage_and_die() {
Expand Down Expand Up @@ -165,26 +163,23 @@ create_plugins_dir() {
# is not shared from OS X and does not belong to the system."
# In any case, creating /var/run/scope/plugins on Mac OS would not work, as domain
# sockets do not cross VM boundaries. We need this directory to exits on the VM.
# shellcheck disable=SC2086
docker run $USERNS_HOST --rm --entrypoint=/bin/sh \
-v /var/run:/var/run \
"$SCOPE_IMAGE" -c "mkdir -p /var/run/scope/plugins"
}

docker_args() {
# shellcheck disable=SC2086
echo --privileged $USERNS_HOST --net=host --pid=host \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /var/run/scope/plugins:/var/run/scope/plugins \
-v /sys/kernel/debug:/sys/kernel/debug \
-e CHECKPOINT_DISABLE \
$WEAVESCOPE_DOCKER_ARGS
-e CHECKPOINT_DISABLE
}

launch_command() {
# shellcheck disable=SC2046
# shellcheck disable=SC2046,SC2086
echo docker run -d --name="$SCOPE_CONTAINER_NAME" $(docker_args) \
"$SCOPE_IMAGE" --probe.docker=true
$WEAVESCOPE_DOCKER_ARGS "$SCOPE_IMAGE" --probe.docker=true
}

launch_docker4mac_app_command() {
Expand Down Expand Up @@ -235,9 +230,7 @@ case "$COMMAND" in
;;

version)
# shellcheck disable=SC2086
docker run --rm -e CHECKPOINT_DISABLE --entrypoint=/home/weave/scope \
$WEAVESCOPE_DOCKER_ARGS "$SCOPE_IMAGE" --mode=version
docker run --rm --entrypoint=/home/weave/scope "$SCOPE_IMAGE" --mode=version
;;

-h | help | -help | --help)
Expand Down Expand Up @@ -279,7 +272,6 @@ case "$COMMAND" in
if check_listen_address_arg; then
echo "Weave Scope is reachable at the address specified with --app.http.address" >&2
else
# shellcheck disable=SC2086
IP_ADDRS=$(docker run --rm $USERNS_HOST --net=host --entrypoint /bin/sh "$SCOPE_IMAGE" -c "$IP_ADDR_CMD")
# shellcheck disable=SC2086
print_app_endpoints $IP_ADDRS
Expand Down