Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add daemon option --default-shm-size 

This fix fixes issue raised in 29492 where it was not
possible to specify a default `--default-shm-size` in daemon
configuration for each `docker run``.

The flag `--default-shm-size` which is reloadable, has been
added to the daemon configuation.
Related docs has been updated.

This fix fixes 29492.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2016-12-25 01:11:12 -08:00 committed by Tibor Vass
parent ecfe6ab218
commit 205ebd8d30
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/commandline/dockerd.md
View File

@ -37,6 +37,7 @@ Options:
--default-gateway value Container default gateway IPv4 address --default-gateway value Container default gateway IPv4 address
--default-gateway-v6 value Container default gateway IPv6 address --default-gateway-v6 value Container default gateway IPv6 address
--default-runtime string Default OCI runtime for containers (default "runc") --default-runtime string Default OCI runtime for containers (default "runc")
--default-shm-size bytes Set the default shm size for containers (default 64 MiB)
--default-ulimit value Default ulimits for containers (default []) --default-ulimit value Default ulimits for containers (default [])
--disable-legacy-registry Disable contacting legacy registries --disable-legacy-registry Disable contacting legacy registries
--dns value DNS server to use (default []) --dns value DNS server to use (default [])
@ -1161,6 +1162,7 @@ This is a full example of the allowed configuration options on Linux:
"cluster-advertise": "", "cluster-advertise": "",
"max-concurrent-downloads": 3, "max-concurrent-downloads": 3,
"max-concurrent-uploads": 5, "max-concurrent-uploads": 5,
"default-shm-size": "64M",
"shutdown-timeout": 15, "shutdown-timeout": 15,
"debug": true, "debug": true,
"hosts": [], "hosts": [],

4
man/dockerd.8.md
View File

@ -21,6 +21,7 @@ dockerd - Enable daemon mode
[**--default-gateway**[=*DEFAULT-GATEWAY*]] [**--default-gateway**[=*DEFAULT-GATEWAY*]]
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]] [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
[**--default-runtime**[=*runc*]] [**--default-runtime**[=*runc*]]
[**--default-shm-size**[=*64MiB*]]
[**--default-ulimit**[=*[]*]] [**--default-ulimit**[=*[]*]]
[**--disable-legacy-registry**] [**--disable-legacy-registry**]
[**--dns**[=*[]*]] [**--dns**[=*[]*]]
@ -164,6 +165,9 @@ $ sudo dockerd --add-runtime runc=runc --add-runtime custom=/usr/local/bin/my-ru
**--default-runtime**="runc" **--default-runtime**="runc"
Set default runtime if there're more than one specified by `--add-runtime`. Set default runtime if there're more than one specified by `--add-runtime`.
**--default-shm-size**=*64MiB*
Set the daemon-wide default shm size for containers. Default is `64MiB`.
**--default-ulimit**=[] **--default-ulimit**=[]
Default ulimits for containers. Default ulimits for containers.