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

parse --probe-only as intended #2300

Merged
merged 2 commits into from
Mar 5, 2017
Merged

parse --probe-only as intended #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df41a80
parse probe-only flag as intended
rade Mar 4, 2017
0aec6fe
consistency: --no-app is used elsewhere; --probe-only isn't
rade Mar 4, 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
2 changes: 1 addition & 1 deletion docker/Dockerfile.cloud-agent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \
ADD ./docker /usr/local/bin/
ADD ./weave ./weaveutil /usr/bin/
COPY ./scope /home/weave/
ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--probe-only", "--probe.docker=true"]
ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"]

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

4 changes: 2 additions & 2 deletions prog/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ func main() {
// They are also here so they are included in usage, and the probe uses them to decide if to
// publish to localhost.
noApp := flag.Bool("no-app", false, "Don't run the app.")
probeOnly := flag.Bool("app-only", false, "Only run the app")
flag.Bool("probe-only", false, "Only run the probe.")
probeOnly := flag.Bool("probe-only", false, "Only run the app.")
flag.Bool("no-probe", false, "Don't run the probe.")
flag.Bool("app-only", false, "Only run the probe.")

// Probe flags
flag.StringVar(&flags.probe.token, serviceTokenFlag, "", "Token to use to authenticate with cloud.weave.works")
Expand Down