introduce 'Proxy' as 'Docker API Proxy'

in order to reduce potential confusion about its role.

Closes #1019.
This commit is contained in:
Matthias Radestock committed 2015-07-03 03:33:23 +01:00
1 parent 0f5f671054
commit 7d5dcfafc9
5 files changed
+20 -17

No files matched your search

+4 -2
View File
@@ -57,8 +57,10 @@ our data centre.
### <a name="docker"></a>Seamless Docker integration
Weave includes a [proxy](proxy.html) so that containers launched via
the Docker [command-line interface](https://docs.docker.com/reference/commandline/cli/) or
Weave includes a [Docker API proxy](proxy.html) so that containers
launched via the Docker
[command-line interface](https://docs.docker.com/reference/commandline/cli/)
or
[remote API](https://docs.docker.com/reference/api/docker_remote_api/)
are attached to the weave network before they begin execution.
+3 -2
View File
@@ -29,8 +29,9 @@ encrypted, which carry encapsulated network packets. These
Weave creates a network bridge on the host. Each container is
connected to that bridge via a veth pair, the container side of which
is given the IP address & netmask supplied by the proxy. Also
connected to the bridge is the weave router container.
is given an IP address & netmask supplied either by the user or
Weave's IP address allocator. Also connected to the bridge is the
weave router container.
A weave router captures Ethernet packets from its bridge-connected
interface in promiscuous mode, using 'pcap'. This typically excludes
+3 -3
View File
@@ -3,10 +3,10 @@ title: Weave Proxy
layout: default
---
# Weave Proxy
# Weave Docker API Proxy
The proxy automatically attaches containers to the weave network when
they are started using the ordinary Docker
The Docker API proxy automatically attaches containers to the weave
network when they are started using the ordinary Docker
[command-line interface](https://docs.docker.com/reference/commandline/cli/)
or
[remote API](https://docs.docker.com/reference/api/docker_remote_api/),
+1 -1
View File
@@ -142,7 +142,7 @@ is waiting for a while before connecting again.
There may also be further sections for the
[IP address allocator](ipam.html#troubleshooting),
[weaveDNS](weavedns.html#troubleshooting), and
[proxy](proxy.html#troubleshooting).
[Weave Docker API Proxy](proxy.html#troubleshooting).
### <a name="list-attached-containers"></a>List attached containers