From 7abed164ebb541939c85044af6691cd7db937607 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 13 Jun 2016 16:11:01 +0100 Subject: [PATCH 1/2] Clean up reference to 'above' --- site/weavedns/managing-domains-weavedns.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/site/weavedns/managing-domains-weavedns.md b/site/weavedns/managing-domains-weavedns.md index 758a2415..85fa895b 100644 --- a/site/weavedns/managing-domains-weavedns.md +++ b/site/weavedns/managing-domains-weavedns.md @@ -10,12 +10,10 @@ The following topics are discussed: ## Configuring the domain search paths -If you don't supply a domain search path (with `--dns-search=`), -`weave run ...` tells a container to look for "bare" hostnames, like -`pingme`, in its own domain (or in `weave.local` if it has no domain). -That's why you can just invoke `ping pingme` above -- since the -hostname is `ubuntu.weave.local`, it will look for -`pingme.weave.local`. +If you don't supply a domain search path (with `--dns-search=`), Weave +Net (via the [proxy](/site/weave-docker-api.md) or via `weave run`) +tells a container to look for "bare" hostnames, like `pingme`, in its +own domain (or in `weave.local` if it has no domain). If you want to supply other entries for the domain search path, e.g. if you want containers in different sub-domains to resolve From e9770740d8f622e8d34e8386e9712c480d05707f Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 13 Jun 2016 16:12:42 +0100 Subject: [PATCH 2/2] Use short name rather than long hex ID --- site/weave-docker-api/using-proxy.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md index cbccc57e..264ceb6a 100644 --- a/site/weave-docker-api/using-proxy.md +++ b/site/weave-docker-api/using-proxy.md @@ -20,9 +20,8 @@ To create and start a container via the Weave Net proxy run: or, equivalently run: - host1$ docker create -ti ubuntu - 5ef831df61d50a1a49272357155a976595e7268e590f0a2c75693337b14e1382 - host1$ docker start 5ef831df61d50a1a49272357155a976595e7268e590f0a2c75693337b14e1382 + host1$ docker create -ti --name=foo ubuntu + host1$ docker start foo Specific IP addresses and networks can be supplied in the `WEAVE_CIDR` environment variable, for example: