Review feedback

This commit is contained in:
Tom Wilkie committed 2016-02-26 15:35:12 +00:00
1 parent b228bbb9fb
commit 6ff7419981
7 files changed
+4494 -6

No files matched your search

+4 -1
View File
@@ -55,12 +55,15 @@ For installing weave on other platforms, follow the [integration guides](http://
Weave respects the environment variable `DOCKER_HOST`, so you can run
it locally to control a weave network on a remote host.
Weave will periodically check with our servers to see if a new version is available. To disable this, run:
Weave will periodically check with our servers to see if a new version is available.
New versions are announced in the log. To disable this, run:
```
CHECKPOINT_DISABLE=true weave launch
```
For more information, [read this](https://github.com/weaveworks/go-checkpoint).
## Quick Start Screencast
<a href="https://youtu.be/kihQCCT1ykE" alt="Click to watch the screencast" target="_blank">
+1
View File
@@ -3,4 +3,5 @@ MAINTAINER Weaveworks Inc <help@weave.works>
LABEL works.weave.role=system
WORKDIR /home/weave
ADD ./weaver /home/weave/
COPY ca-certificates.crt /etc/ssl/certs/
ENTRYPOINT ["/home/weave/weaver"]
File diff suppressed because it is too large. Load diff
+1 -2
View File
@@ -37,7 +37,6 @@ type dnsConfig struct {
}
const (
signatureFile = "/etc/weave/signature"
versionCheckPeriod = 6 * time.Hour
)
@@ -55,7 +54,7 @@ func check() {
params := checkpoint.CheckParams{
Product: "weave-net",
Version: version,
SignatureFile: signatureFile,
SignatureFile: "",
}
resp, err := checkpoint.Check(&params)
handleResponse(resp, err)
+1 -1
View File
@@ -118,7 +118,7 @@ weave_on() {
host=$1
shift 1
[ -z "$DEBUG" ] || greyly echo "Weave on $host:$DOCKER_PORT: $@" >&2
DOCKER_HOST=tcp://$host:$DOCKER_PORT $WEAVE "$@"
CHECKPOINT_DISABLE=true DOCKER_HOST=tcp://$host:$DOCKER_PORT $WEAVE "$@"
}
stop_router_on() {
-1
View File
@@ -1594,7 +1594,6 @@ launch_router() {
-d --privileged --net=host $(docker_sock_options) \
-e WEAVE_PASSWORD \
-e CHECKPOINT_DISABLE \
-v /etc/weave:/etc/weave \
$WEAVE_DOCKER_ARGS $IMAGE $COVERAGE_ARGS \
--port $CONTAINER_PORT --name "$PEERNAME" --nickname "$(hostname)" \
$(router_opts_$BRIDGE_TYPE) \