Michael Bridgen
4ede33468e
Update docs and smoke-tests with new option names
2015-07-07 11:26:09 +01:00
Bryan Boreham
f593c2fbf2
Change default IP allocation range from 10.128/10 to 10.32/12
2015-07-06 17:09:05 +01:00
Paul Bellamy
5c44f74475
rename proxy-(env|config) to (env|config)
...
Keep error message to stderr, as the proxy should be launched with
'weave launch'. 'proxy-(env|config)' are kept with a deprecation
warning, for a while.
2015-07-06 13:41:23 +01:00
Matthias Radestock
f31a3c1261
Merge branch '1.0'
2015-07-03 11:48:07 +01:00
Matthias Radestock
243d445d1b
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 10:59:10 +01:00
Matthias Radestock
65cd2b0e04
missed one
2015-07-03 10:58:22 +01:00
Matthias Radestock
33b230c114
Merge branch 'latest_release_doc_updates' into 1.0
2015-07-03 10:56:00 +01:00
Matthias Radestock
7d5dcfafc9
introduce 'Proxy' as 'Docker API Proxy'
...
in order to reduce potential confusion about its role.
Closes #1019 .
2015-07-03 03:33:23 +01:00
Michael Bridgen
c0b2fe3e3b
Remove references to 'IPAM' in docs and UI
...
The option `--no-default-ipam` is replaced with
`--no-default-ipalloc`; the former will still work (in a 'last one
wins' way), but its usage message says it's deprecated.
2015-06-29 19:20:26 +01:00
Tom Wilkie
c4565f6ed3
Make proxy listen on /var/run/weave.sock
2015-06-26 15:08:21 +00:00
Adam Harrison
a9e3320e7c
Update documentation
2015-06-25 14:43:29 +01:00
Matthias Radestock
2c73fd6dde
Merge branch 'latest_release_doc_updates' into 1.0
2015-06-23 23:17:38 +01:00
Matthias Radestock
3b27413887
fix broken link
2015-06-23 23:17:05 +01:00
Bryan Boreham
68ca6ebe04
Change one IPAM proxy example to use the 'net:' syntax
2015-06-22 14:15:24 +01:00
Adam Harrison
b1bd1d4d6a
Merge pull request #964 from awh/v1.0_use_proxy_doc_updates
...
Update documentation to leverage proxy
2015-06-22 10:46:00 +01:00
Adam Harrison
6ddecfc764
Update proxy docs
2015-06-22 10:36:56 +01:00
Matthias Radestock
56c720b078
remove the -D proxy option from the docs
...
It doesn't do anything useful since the weave script needs to be able
to talk to docker on the standard unix socket.
Also remove dangling reference to 'localhost', and move note about
firwalls to where it is most pertinent.
Part fix to #972 .
2015-06-22 10:20:18 +01:00
Paul Bellamy
ca681bce13
[proxy] Add support for WEAVE_CIDR=none
...
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
2015-06-17 14:51:12 +01:00
Paul Bellamy
220c80c3ed
[proxy] --with-ipam -> --no-default-ipam
2015-06-17 11:31:33 +01:00
Matthias Radestock
9276df62c2
document weave stop-proxy
2015-06-17 07:09:47 +01:00
Matthias Radestock
ae5c2dab86
take advantage of recent features in proxy example
2015-06-16 23:01:14 +01:00
Matthias Radestock
0452076ebc
remove outdated note
2015-06-16 22:58:30 +01:00
Matthias Radestock
7831460eff
rely on ipam for launch-dns in proxy example
2015-06-16 22:51:57 +01:00
Matthias Radestock
20d5790358
drop -iprange from proxy docs, since ipam is enabled by default now
2015-06-16 22:51:10 +01:00
Matthias Radestock
a52702f76e
fix typo
2015-06-16 22:46:41 +01:00
Matthias Radestock
351573c122
simplify proxy launch examples
...
No need to specify --with-dns if DNS is running.
This should have been changed as part of #898 .
2015-06-16 22:38:53 +01:00
Adam Harrison
03b83811fa
Update documentation
2015-06-16 14:07:42 +01:00
Paul Bellamy
8873d69b77
[proxy] Add --without-dns flag, and change meaning of --with-dns flag
2015-06-16 14:07:40 +01:00
Paul Bellamy
678063efec
updating proxy docs on hostname/domainname dns
2015-06-11 10:27:34 +01:00
Paul Bellamy
2d5e362115
[proxy] use logs for getting proxy-env and proxy-config
...
It's ugly, but beats arg-parsing, inspecting the container and piecing
the address together from exposed ports.
We could just use the host from DOCKER_HOST, but that will fail in the
case of a host with multiple IPs, where the proxy only listens on one.
2015-06-10 15:24:53 +01:00
Paul Bellamy
6bb087cecd
[proxy] Renaming flags: -H -> -D, -L -> -H
...
As per discussion in issue 875
2015-06-10 12:13:52 +01:00
Paul Bellamy
4a7d4d3555
[proxy] documenting -L option
2015-06-10 12:13:51 +01:00
Matthias Radestock
fee2898c05
remove detailed proxy status
...
There are two problems with obtaining the proxy status via the normal
proxy endpoint...
1. when TLS is enabled, this requires using TLS at the client end
2. the status URL is mixed in with the docker remote API, which is
rather unclean
There is limited value to having some status output from the proxy,
since all the output is constant.
So instead we log the version and command line args, and in `weave
status` only report whether the proxy is running.
We still want a way to wait for the proxy to start up, and log a nice
error if it dies. We do this by polling the docker logs for a startup
message.
Fixes #877 . Fixes #876 .
Undoes most of #756 , #800 , #854 .
2015-06-09 14:03:52 +01:00
Matthias Radestock
8a5725fa74
correct docs for proxy's -H
2015-06-08 10:26:21 +01:00
Matthias Radestock
9d707b9670
add proxy troubleshooting docs
...
Closes #854 .
2015-06-07 13:32:02 +01:00
Matthias Radestock
ad92bbc8c8
get rid of proxy 'Advantages' section
...
instead point out the main purpose right at the top, and list further
benefits in the 'Usage'.
Also, expand docs on configuring the listener.
2015-06-06 23:57:20 +01:00
Matthias Radestock
e1ba892827
go back to using the tcp:// prefix in DOCKER_HOST
...
seems to be the recommended way
2015-06-06 23:54:46 +01:00
Matthias Radestock
897f625db9
substantial reworking of the proxy TLS docs
2015-06-06 23:08:08 +01:00
Matthias Radestock
33c03e00e4
rewrite proxy dns docs, and add a complete multi-host example
2015-06-06 21:34:26 +01:00
Matthias Radestock
03ede29e7e
ditch proxy 'Limitations' section
2015-06-06 21:22:09 +01:00
Matthias Radestock
4ea451378e
cosmetic
2015-06-06 21:18:57 +01:00
Matthias Radestock
542f966dcd
typo
2015-06-06 21:14:44 +01:00
Matthias Radestock
198b7db463
simplify examples - don't specify a command on container start
2015-06-06 21:13:46 +01:00
Matthias Radestock
b22fbd3734
expand proxy setup documentation
2015-06-06 21:11:39 +01:00
Matthias Radestock
06716ba132
rewrite proxy ipam docs
2015-06-06 16:57:50 +01:00
Matthias Radestock
52509087a7
cosmetic
2015-06-06 16:19:44 +01:00
Paul Bellamy
edeb531940
[docs] rewording proxy TLS docs
2015-06-05 14:35:00 +01:00
Paul Bellamy
fa6707effa
[docs] adding paragraph about docker listening on unix socket for proxy
2015-06-05 13:23:15 +01:00
Paul Bellamy
a1ffbb528c
adding documentation on using the proxy with tls
2015-06-05 13:23:14 +01:00
Paul Bellamy
a957ed253c
Capitalizing and standardizing titles of pages in the docs.
...
Also re-wording to make them match the page title.
2015-06-03 15:59:40 +01:00
Michael Bridgen