Skip to content

Commit

Permalink
Merge pull request #161 from rmoorman/patch-1
Browse files Browse the repository at this point in the history
Correct wording
  • Loading branch information
vfarcic authored Mar 2, 2017
2 parents ef850c3 + 38ae263 commit 7b79d2a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The goal of the *Docker Flow Proxy* project is to provide an easy way to reconfigure proxy every time a new service is deployed, or when a service is scaled. It does not try to "reinvent the wheel", but to leverage the existing leaders and combine them through an easy to use integration. It uses [HAProxy](http://www.haproxy.org/) as a proxy and adds custom logic that allows on-demand reconfiguration.

Since the Docker 1.12 release, *Docker Flow Proxy* supports two modes. The default mode is designed to work with any setup and requires Consul and Registrator. The *swarm* mode aims to leverage the benefits that come with *Docker Swarm* and new networking introduced in the 1.12 release. The later mode (*swarm*) does not have any dependency but Docker Engine. The *swarm* mode is recommended for all who use *Docker Swarm* features introduced in v1.12.
Since the Docker 1.12 release, *Docker Flow Proxy* supports two modes. The default mode is designed to work with any setup and requires Consul and Registrator. The *swarm* mode aims to leverage the benefits that come with *Docker Swarm* and new networking introduced in the 1.12 release. The latter mode (*swarm*) does not have any dependency but Docker Engine. The *swarm* mode is recommended for all who use *Docker Swarm* features introduced in v1.12.

The recommendation is to run *Docker Flow Proxy* inside a Swarm cluster with Automatic Reconfiguration.

Expand All @@ -19,4 +19,4 @@ Please visit the [config](config.md) and [usage](usage.md) sections for more det

Please join the #df-proxy Slack channel in [DevOps20](http://slack.devops20toolkit.com/) if you have any questions, suggestions, or problems.

<a href='https://ko-fi.com/A655LRB' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://az743702.vo.msecnd.net/cdn/kofi2.png?v=0' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
<a href='https://ko-fi.com/A655LRB' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://az743702.vo.msecnd.net/cdn/kofi2.png?v=0' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>

0 comments on commit 7b79d2a

Please sign in to comment.