From 06c3a0cf2a1738acddbbee0dbd7d84e82d8169da Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Tue, 23 Jun 2015 14:04:39 +0100 Subject: [PATCH 1/2] Add docker integration section to feature docs --- site/features.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/features.md b/site/features.md index 50dd101b..b39ee25c 100644 --- a/site/features.md +++ b/site/features.md @@ -9,6 +9,7 @@ Weave has a few more features beyond those illustrated by the [basic example](https://github.com/weaveworks/weave#example): * [Virtual ethernet switch](#virtual-ethernet-switch) + * [Seamless Docker integration](#docker) * [Address allocation](#addressing) * [Naming and discovery](#naming-and-discovery) * [Application isolation](#application-isolation) @@ -55,6 +56,13 @@ now re-use the same tools and techniques when deploying applications as containers as we would have done when deploying them 'on metal' in our data centre. +### 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 +[remote API](https://docs.docker.com/reference/api/docker_remote_api/) +are attached to the weave network before they begin execution. + ### Address allocation Containers are automatically allocated an IP address that is unique From d0a1514ab69084173f858b883ca7d224014a8bdb Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Tue, 23 Jun 2015 14:05:18 +0100 Subject: [PATCH 2/2] Removed redundant further reading section from feature docs --- site/features.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/site/features.md b/site/features.md index b39ee25c..898e0684 100644 --- a/site/features.md +++ b/site/features.md @@ -25,7 +25,6 @@ example](https://github.com/weaveworks/weave#example): * [Dynamic topologies](#dynamic-topologies) * [Container mobility](#container-mobility) * [Fault tolerance](#fault-tolerance) - * [Further reading](#further-reading) ### Virtual Ethernet Switch @@ -517,13 +516,3 @@ stop`) and restart it. Application containers do *not* have to be restarted in that event, and indeed may not even experience a temporary connectivity failure if the weave container is restarted quickly enough. - -### Further reading - -We have made use of weave's automatic IP address allocation, DNS -server, and proxy throughout the examples. Each of these components -offers additional functionality which you can read about here: - - * [Automatic IP address management](ipam.html) - * [Automatic discovery with WeaveDNS](weavedns.html) - * [Configuring the interaction with Docker](proxy.html)