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

Clarify that nproc is not for per container

Browse Source 
Fix ulimit nproc spec in daemon

Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 54ac3ad736d633956a89aa478c6eb89d648a34df
Component: engine
This commit is contained in:
Harry Zhang
2015-06-28 22:40:53 +08:00
parent d139e0f463
commit 228bda77d9
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/docs/reference/commandline/daemon.md
View File

@ -446,6 +446,10 @@ these defaults are not set, `ulimit` settings will be inherited, if not set on
`docker run`, from the Docker daemon. Any `--ulimit` options passed to
`docker run` will overwrite these defaults.
Be careful setting `nproc` with the `ulimit` flag as `nproc` is designed by Linux to
set the maximum number of processes available to a user, not to a container. For details
please check the [run](run.md) reference.
## Miscellaneous options
IP masquerading uses address translation to allow containers without a public