diff --git a/compose/compose-file/compose-file-v1.md b/compose/compose-file/compose-file-v1.md index d66c85682a..ba49a46a8c 100644 --- a/compose/compose-file/compose-file-v1.md +++ b/compose/compose-file/compose-file-v1.md @@ -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. diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md index 9f96fa2d68..81303fe9a7 100644 --- a/compose/compose-file/compose-file-v2.md +++ b/compose/compose-file/compose-file-v2.md @@ -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 diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index 4d7134f4c0..a4e7dbb92a 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -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