toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Add docs for `--memory-swap`.
Upstream-commit: a276706719a9c2d437c643281639ffa80daf1fdd
Component: engine
This commit is contained in:
James Turnbull
2015-01-20 18:20:13 -05:00
parent a150249a50 3a60e835c5
commit 1c8677b886
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/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
--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)
-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)
--name="" Assign a name to the container
--net="bridge" Set the Network mode for the container