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

Documented special case of container memory limits in manpages

Browse source 
If a container is started with a memory limit of 0, no memory limit is applied.
To prevent this from causing confusion, make interaction explicit in docs.

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)
This commit is contained in:
Matt Heon 2014-05-30 13:55:13 -04:00
parent 8622641b58
commit ba1c0f4c81
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/man/md/docker-run.1.md
View file

@ -100,8 +100,8 @@ container can be started with the **--link**.
**-m**, **-memory**=*memory-limit* **-m**, **-memory**=*memory-limit*
Allows you to constrain the memory available to a container. If the host Allows you to constrain the memory available to a container. If the host
supports swap memory, then the -m memory setting can be larger than physical supports swap memory, then the -m memory setting can be larger than physical
RAM. The memory limit format: <number><optional unit>, where unit = b, k, m or RAM. If a limit of 0 is specified, the container's memory is not limited. The
g. memory limit format: <number><optional unit>, where unit = b, k, m or g.
**-P**, **-publish-all**=*true*|*false* **-P**, **-publish-all**=*true*|*false*
When set to true publish all exposed ports to the host interfaces. The When set to true publish all exposed ports to the host interfaces. The

2
contrib/man/old-man/docker-run.1
View file

@ -39,7 +39,7 @@ CPU shares in relative weight. You can increase the priority of a container with
.TP .TP
.B -m, --memory=\fImemory-limit\fR: .B -m, --memory=\fImemory-limit\fR:
Allows you to constrain the memory available to a container. If the host supports swap memory, then the -m memory setting can be larger than physical RAM. The memory limit format: <number><optional unit>, where unit = b, k, m or g. Allows you to constrain the memory available to a container. If the host supports swap memory, then the -m memory setting can be larger than physical RAM. If a limit of 0 is specified, the container's memory is not limited. The memory limit format: <number><optional unit>, where unit = b, k, m or g.
.TP .TP
.B --cidfile=\fIfile\fR: .B --cidfile=\fIfile\fR: