kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #10206 from jfrazelle/add-docs-memory-swap

Browse source 
Add docs for `--memory-swap`.
This commit is contained in:
James Turnbull 2015-01-20 18:20:13 -05:00
commit a276706719
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/man/docker-run.1.md
View file

@ -28,6 +28,7 @@ docker-run - Run a command in a new container
[**--link**[=*[]*]] [**--link**[=*[]*]]
[**--lxc-conf**[=*[]*]] [**--lxc-conf**[=*[]*]]
[**-m**|**--memory**[=*MEMORY*]] [**-m**|**--memory**[=*MEMORY*]]
[**--memory-swap**[=*MEMORY-SWAP]]
[**--mac-address**[=*MAC-ADDRESS*]] [**--mac-address**[=*MAC-ADDRESS*]]
[**--name**[=*NAME*]] [**--name**[=*NAME*]]
[**--net**[=*"bridge"*]] [**--net**[=*"bridge"*]]
@ -191,6 +192,11 @@ actual limit may be rounded up to a multiple of the operating system's page
size, if it is not already. The memory limit should be formatted as follows: size, if it is not already. The memory limit should be formatted as follows:
`<number><optional unit>`, where unit = b, k, m or g. `<number><optional unit>`, where unit = b, k, m or g.
**--memory-swap**=""
Total memory usage (memory + swap)
Set '-1' to disable swap (format: <number><optional unit>, where unit = b, k, m or g)
**--mac-address**="" **--mac-address**=""
Container MAC address (e.g. 92:d0:c6:0a:29:33) Container MAC address (e.g. 92:d0:c6:0a:29:33)

1
docs/sources/reference/commandline/cli.md
View file

@ -1613,6 +1613,7 @@ removed before the image is removed.
--link=[] Add link to another container in the form of name:alias --link=[] Add link to another container in the form of name:alias
--lxc-conf=[] (lxc exec-driver only) Add custom lxc options --lxc-conf="lxc.cgroup.cpuset.cpus = 0,1" --lxc-conf=[] (lxc exec-driver only) Add custom lxc options --lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"
-m, --memory="" Memory limit (format: <number><optional unit>, where unit = b, k, m or g) -m, --memory="" Memory limit (format: <number><optional unit>, where unit = b, k, m or g)
-memory-swap="" Total memory usage (memory + swap), set '-1' to disable swap (format: <number><optional unit>, where unit = b, k, m or g)
--mac-address="" Container MAC address (e.g. 92:d0:c6:0a:29:33) --mac-address="" Container MAC address (e.g. 92:d0:c6:0a:29:33)
--name="" Assign a name to the container --name="" Assign a name to the container
--net="bridge" Set the Network mode for the container --net="bridge" Set the Network mode for the container