docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clarified Compose resource options for v2, v3 (#4712) 

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-09-25 13:37:09 -07:00 committed by GitHub
parent 0c9ad498f9
commit 6db50d4591
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compose/compose-file/index.md
View File

@ -646,9 +646,12 @@ containers that should be running at any given time.
#### resources #### resources
Configures resource constraints. This replaces the older resource constraint Configures resource constraints.
options in Compose files prior to version 3 (`cpu_shares`, `cpu_quota`,
`cpuset`, `mem_limit`, `memswap_limit`, `mem_swappiness`). > **Note**: This replaces the [older resource constraint options](compose-file-v2.md#cpu-and-other-resources) for non swarm mode in
Compose files prior to version 3 (`cpu_shares`, `cpu_quota`, `cpuset`,
`mem_limit`, `memswap_limit`, `mem_swappiness`), as described in [Upgrading
version 2.x to 3.x](/compose/compose-file/compose-versioning.md#upgrading).
Each of these is a single value, analogous to its [docker service Each of these is a single value, analogous to its [docker service
create](/engine/reference/commandline/service_create.md) counterpart. create](/engine/reference/commandline/service_create.md) counterpart.
@ -1638,7 +1641,7 @@ services:
- type: bind - type: bind
source: ./static source: ./static
target: /opt/app/static target: /opt/app/static
networks: networks:
webnet: webnet:

2
get-started/part4.md
View File

@ -185,7 +185,7 @@ To add a manager to this swarm, run 'docker swarm join-token manager' and follow
> >
> The machine IP addresses returned by `docker-machine ls` include port 2376, > The machine IP addresses returned by `docker-machine ls` include port 2376,
> which is the Docker daemon port. Do not use this port or > which is the Docker daemon port. Do not use this port or
> [you may experience errors](https://forums.docker.com/t/docker-swarm-join-with-virtualbox-connection-error-13-bad-certificate/31392/2). > [you may experience errors](https://forums.docker.com/t/docker-swarm-join-with-virtualbox-connection-error-13-bad-certificate/31392/2){: target="_blank" class="_"}.
As you can see, the response to `docker swarm init` contains a pre-configured As you can see, the response to `docker swarm init` contains a pre-configured