diff --git a/.travis.yml b/.travis.yml index 0439e89b..5e23cac7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,12 @@ -language: go +language: python sudo: false -go: - - 1.4 env: - PATH="${PATH}:${HOME}/.local/bin" -addons: - apt: - packages: - - libpcap-dev - install: - - go clean -i net - - go install -tags netgo std - - go get github.com/golang/lint/golint - - pip install --user --upgrade gsutil + - pip install --upgrade gsutil - bin/setup-ci-secrets $encrypted_5ba036e89377_key $encrypted_5ba036e89377_iv - - make travis - - go get ./... script: - - make tests - -after_success: - - go get github.com/mattn/goveralls - - test "${TRAVIS_PULL_REQUEST}" = "false" && site/build-and-publish.sh + - 'test "${TRAVIS_PULL_REQUEST}" = "false" && site/build-and-publish.sh || true' diff --git a/site/plugin.md b/site/plugin.md index fcd336ef..f9cd005f 100644 --- a/site/plugin.md +++ b/site/plugin.md @@ -18,12 +18,12 @@ Subsequently you can start containers with, e.g. on any of the hosts, and they can all communicate with each other. -> NB: It is inadvisable to attach containers to the weave network +> WARNING: It is inadvisable to attach containers to the weave network > using both the Weave Docker Networking Plugin and > [Weave Docker API Proxy](proxy.html) simultaneously. Such containers > will end up with two weave network interfaces and two IP addresses, -> which is rarely desirable. To ensure the proxy is not being used, *do -> not run `eval $(weave env)`, or `docker $(weave config) ...`*. +> which is rarely desirable. To ensure the proxy is not being used, +> *do not run `eval $(weave env)`, or `docker $(weave config) ...`*. In order to use Weave's [Service Discovery](weavedns.html), you need to pass the additional arguments `--dns` and `-dns-search`, for