Merge pull request #2300 from weaveworks/2299-probe-only

parse --probe-only as intended

Fixes #2299.
This commit is contained in:
Matthias Radestock
2017-03-05 12:06:05 +00:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -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"]

View File

@@ -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")