Updated miscellaneous list of options for each format

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2017-02-21 13:11:37 -08:00
parent 430bbdee81
commit 3e4005c360
3 changed files with 24 additions and 4 deletions

View File

@ -475,7 +475,7 @@ is specified, then read-write will be used.
- service_name
- service_name:ro
### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, oom_score_adj, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
### cpu\_shares, cpu\_quota, cpuset, domainname, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
Each of these is a single value, analogous to its
[docker run](/engine/reference/run.md) counterpart.

View File

@ -913,9 +913,6 @@ Each of these is a single value, analogous to its
stdin_open: true
tty: true
> **Note:** The following options are only available for
> [version 2](compose-versioning.md#version-2) and up:
> `oom_score_adj`
## Specifying durations

View File

@ -1072,6 +1072,29 @@ There are several things to note, depending on which
See [Docker Volumes](/engine/userguide/dockervolumes.md) and
[Volume Plugins](/engine/extend/plugins_volume.md) for more information.
### domainname, hostname, ipc, mac\_address, privileged, read\_only, restart, shm\_size, stdin\_open, tty, user, working\_dir
Each of these is a single value, analogous to its
[docker run](/engine/reference/run.md) counterpart.
user: postgresql
working_dir: /code
domainname: foo.com
hostname: foo
ipc: host
mac_address: 02:42:ac:11:65:43
privileged: true
restart: always
read_only: true
shm_size: 64M
stdin_open: true
tty: true
## Specifying durations
Some configuration options, such as the `interval` and `timeout` sub-options for