Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit f289780

Browse files
committed
update README
1 parent 4307846 commit f289780

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You can use `dockercloud/haproxy` in three different ways:
1717

1818
- running in Docker Cloud
1919
- running with docker legacy links
20-
- running with docker compose v2(new links)
20+
- running with Docker Compose v2(new links, compatible with Docker Swarm)
2121

2222
### Running in Docker Cloud
2323

@@ -77,15 +77,17 @@ Legacy link refers to the link created before docker 1.10, and the link created
7777
**Note**: Any link alias sharing the same prefix and followed by "-/_" with an integer is considered to be from the same service. For example: `web-1` and `web-2` belong to service `web`, `app_1` and `app_2` are from service `app`, but `app1` and `web2` are from different services.
7878

7979

80-
### Running with docker-compose v2(new links)
80+
### Running with Docker Compose v2(new links, compatible with Docker Swarm)
8181

82-
Docker Compose 1.6 supports a new format of the compose file. In the new version(v2), the old link that injects environment variables is deprecated. Similar to using legacy links, here list some differences that you need to notice:
82+
Docker Compose 1.6 supports a new format of the compose file. In the new version(v2), the old link that injects environment variables is deprecated.
8383

84-
- This image must be run using Docker Compose, as it relies on the Docker Compose labels for configuration
85-
- The container needs access to the docker socket, you must mount the correct files and set the related environment to make it work
84+
Similar to using legacy links, here list some differences that you need to notice:
85+
- This image must be run using Docker Compose, as it relies on the Docker Compose labels for configuration.
86+
- The container needs access to the docker socket, you must mount the correct files and set the related environment to make it work.
8687
- A link is required in order to ensure that dockercloud/haproxy is aware of which service it needs to balance, although links are not needed for service discovery since docker 1.10. Linked aliases are not required.
87-
- DO not overwrite `HOSTNAME` environment variable in `dockercloud/haproxy container`
88-
- As it is the case on Docker Cloud, auto reconfiguration is supported when the linked services scales or/and the linked container starts/stops
88+
- DO not overwrite `HOSTNAME` environment variable in `dockercloud/haproxy container`.
89+
- As it is the case on Docker Cloud, auto reconfiguration is supported when the linked services scales or/and the linked container starts/stops.
90+
- This image is also compatible with Docker Swarm, and supports the docker native `overlay` network across multi-hosts.
8991

9092
##### example of docker-compose.yml running in linux:
9193

0 commit comments

Comments
 (0)