pids limit support

update bash commpletion for pids limit

update check config for kernel

add docs for pids limit

add pids stats

add stats to docker client

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
Jessica Frazelle 2015-12-15 11:15:43 -08:00 committed by Tibor Vass
parent d3f632156e
commit fd1c2150ad
6 changed files with 12 additions and 0 deletions

View File

@ -1637,6 +1637,7 @@ _docker_run() {
--net-alias --net-alias
--oom-score-adj --oom-score-adj
--pid --pid
--pids-limit
--publish -p --publish -p
--restart --restart
--security-opt --security-opt

View File

@ -534,6 +534,7 @@ __docker_subcommand() {
"($help)*--net-alias=[Add network-scoped alias for the container]:alias: " "($help)*--net-alias=[Add network-scoped alias for the container]:alias: "
"($help)--oom-kill-disable[Disable OOM Killer]" "($help)--oom-kill-disable[Disable OOM Killer]"
"($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]" "($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]"
"($help)--pids-limit[Tune container pids limit (set -1 for unlimited)]"
"($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]" "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]"
"($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports" "($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports"
"($help)--pid=[PID namespace to use]:PID: " "($help)--pid=[PID namespace to use]:PID: "

View File

@ -74,6 +74,7 @@ Creates a new container.
-P, --publish-all Publish all exposed ports to random ports -P, --publish-all Publish all exposed ports to random ports
-p, --publish=[] Publish a container's port(s) to the host -p, --publish=[] Publish a container's port(s) to the host
--pid="" PID namespace to use --pid="" PID namespace to use
--pids-limit=-1 Tune container pids limit (set -1 for unlimited), kernel >= 4.3
--privileged Give extended privileges to this container --privileged Give extended privileges to this container
--read-only Mount the container's root filesystem as read only --read-only Mount the container's root filesystem as read only
--restart="no" Restart policy (no, on-failure[:max-retry], always, unless-stopped) --restart="no" Restart policy (no, on-failure[:max-retry], always, unless-stopped)

View File

@ -74,6 +74,7 @@ parent = "smn_cli"
-P, --publish-all Publish all exposed ports to random ports -P, --publish-all Publish all exposed ports to random ports
-p, --publish=[] Publish a container's port(s) to the host -p, --publish=[] Publish a container's port(s) to the host
--pid="" PID namespace to use --pid="" PID namespace to use
--pids-limit=-1 Tune container pids limit (set -1 for unlimited), kernel >= 4.3
--privileged Give extended privileges to this container --privileged Give extended privileges to this container
--read-only Mount the container's root filesystem as read only --read-only Mount the container's root filesystem as read only
--restart="no" Restart policy (no, on-failure[:max-retry], always, unless-stopped) --restart="no" Restart policy (no, on-failure[:max-retry], always, unless-stopped)

View File

@ -58,6 +58,7 @@ docker-create - Create a new container
[**-P**|**--publish-all**] [**-P**|**--publish-all**]
[**-p**|**--publish**[=*[]*]] [**-p**|**--publish**[=*[]*]]
[**--pid**[=*[]*]] [**--pid**[=*[]*]]
[**--pids-limit**[=*PIDS_LIMIT*]]
[**--privileged**] [**--privileged**]
[**--read-only**] [**--read-only**]
[**--restart**[=*RESTART*]] [**--restart**[=*RESTART*]]
@ -290,6 +291,9 @@ unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
**host**: use the host's PID namespace inside the container. **host**: use the host's PID namespace inside the container.
Note: the host mode gives the container full access to local PID and is therefore considered insecure. Note: the host mode gives the container full access to local PID and is therefore considered insecure.
**--pids-limit**=""
Tune the container's pids limit. Set `-1` to have unlimited pids for the container.
**--privileged**=*true*|*false* **--privileged**=*true*|*false*
Give extended privileges to this container. The default is *false*. Give extended privileges to this container. The default is *false*.

View File

@ -60,6 +60,7 @@ docker-run - Run a command in a new container
[**-P**|**--publish-all**] [**-P**|**--publish-all**]
[**-p**|**--publish**[=*[]*]] [**-p**|**--publish**[=*[]*]]
[**--pid**[=*[]*]] [**--pid**[=*[]*]]
[**--pids-limit**[=*PIDS_LIMIT*]]
[**--privileged**] [**--privileged**]
[**--read-only**] [**--read-only**]
[**--restart**[=*RESTART*]] [**--restart**[=*RESTART*]]
@ -420,6 +421,9 @@ Use `docker port` to see the actual mapping: `docker port CONTAINER $CONTAINERPO
**host**: use the host's PID namespace inside the container. **host**: use the host's PID namespace inside the container.
Note: the host mode gives the container full access to local PID and is therefore considered insecure. Note: the host mode gives the container full access to local PID and is therefore considered insecure.
**--pids-limit**=""
Tune the container's pids limit. Set `-1` to have unlimited pids for the container.
**--uts**=*host* **--uts**=*host*
Set the UTS mode for the container Set the UTS mode for the container
**host**: use the host's UTS namespace inside the container. **host**: use the host's UTS namespace inside the container.