This commit is contained in:
Anita Buehrle committed 2016-03-30 17:05:26 -06:00
1 parent 254be128b0
commit 8a305ee189
11 files changed
+37 -37

No files matched your search

@@ -3,12 +3,12 @@ title: Using Automatic Discovery With the Weave Net Proxy
layout: default
---
Containers launched via the proxy use [weavedns](/site/weavedns/overview-using-weavedns.md)
Containers launched via the proxy use [weaveDNS](/site/weavedns/overview-using-weavedns.md)
automatically if it is running when they are started -
see the [weavedns usage](/site/weavedns/overview-using-weavedns.md#usage) section for an in depth
see the [weaveDNS usage](/site/weavedns/overview-using-weavedns.md#usage) section for an in depth
explanation of the behaviour and how to control it.
Typically, the proxy passes on container names as-is to weavedns
Typically, the proxy passes on container names as-is to weaveDNS
for registration. However, there are situations in which the final container
name may be out of your control (for example, if you are using Docker orchestrators which
append control/namespacing identifiers to the original container names).
@@ -35,7 +35,7 @@ For example, you can launch the proxy using all three flags, as follows:
(for example, `$1`). For further details on the regular expression syntax see
[Google's re2 documentation](https://github.com/google/re2/wiki/Syntax).
After launching the Weave Net proxy with these flags, running a container named `aws-12798186823-foo` without labels results in weavedns registering the hostname `my-app-foo` and not `aws-12798186823-foo`.
After launching the Weave Net proxy with these flags, running a container named `aws-12798186823-foo` without labels results in weaveDNS registering the hostname `my-app-foo` and not `aws-12798186823-foo`.
host1$ docker run -ti --name=aws-12798186823-foo ubuntu ping my-app-foo
PING my-app-foo.weave.local (10.32.0.2) 56(84) bytes of data.
+2 -2
View File
@@ -15,7 +15,7 @@ instead of `weave run`.
The proxy sits between the Docker client (command line or API) and the
Docker daemon, and intercepts the communication between the two. You can
start it simultaneously with the router and weavedns via `launch`:
start it simultaneously with the router and weaveDNS via `launch`:
host1$ weave launch
@@ -62,7 +62,7 @@ The proxy can be stopped independently with
host1$ weave stop-proxy
or in conjunction with the router and weavedns via `stop`.
or in conjunction with the router and weaveDNS via `stop`.
If you set your `DOCKER_HOST` to point at the proxy, you should revert
to the original settings prior to stopping the proxy.