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

Add missing "--default-runtime" flag in manpage 

Add missing flag and more descriptions in manpage.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
This commit is contained in:
Zhang Wei 2016-12-17 22:01:59 +08:00 committed by Tibor Vass
parent fbb21b0191
commit ef5fb30f61
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -684,16 +684,18 @@ configuration file or using the `--add-runtime` command line argument.
The following is an example adding 2 runtimes via the configuration: The following is an example adding 2 runtimes via the configuration:
```json ```json
"default-runtime": "runc", {
"runtimes": { "default-runtime": "runc",
"runc": { "runtimes": {
"path": "runc" "runc": {
}, "path": "runc"
"custom": { },
"path": "/usr/local/bin/my-runc-replacement", "custom": {
"runtimeArgs": [ "path": "/usr/local/bin/my-runc-replacement",
"--debug" "runtimeArgs": [
] "--debug"
]
}
} }
} }
``` ```

34
man/dockerd.8.md
View File

@ -20,6 +20,7 @@ dockerd - Enable daemon mode
[**-D**|**--debug**] [**-D**|**--debug**]
[**--default-gateway**[=*DEFAULT-GATEWAY*]] [**--default-gateway**[=*DEFAULT-GATEWAY*]]
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]] [**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
[**--default-runtime**[=*runc*]]
[**--default-ulimit**[=*[]*]] [**--default-ulimit**[=*[]*]]
[**--disable-legacy-registry**] [**--disable-legacy-registry**]
[**--dns**[=*[]*]] [**--dns**[=*[]*]]
@ -84,7 +85,35 @@ following format.
# OPTIONS # OPTIONS
**--add-runtime**=[] **--add-runtime**=[]
Set additional OCI compatible runtime. Runtimes can be registered with the daemon either via the
configuration file or using the `--add-runtime` command line argument.
The following is an example adding 2 runtimes via the configuration:
```json
{
"default-runtime": "runc",
"runtimes": {
"runc": {
"path": "runc"
},
"custom": {
"path": "/usr/local/bin/my-runc-replacement",
"runtimeArgs": [
"--debug"
]
}
}
}
```
This is the same example via the command line:
```bash
$ sudo dockerd --add-runtime runc=runc --add-runtime custom=/usr/local/bin/my-runc-replacement
```
**Note**: defining runtime arguments via the command line is not supported.
**--api-cors-header**="" **--api-cors-header**=""
Set CORS headers in the Engine API. Default is cors disabled. Give urls like Set CORS headers in the Engine API. Default is cors disabled. Give urls like
@ -132,6 +161,9 @@ following format.
**--default-gateway-v6**="" **--default-gateway-v6**=""
IPv6 address of the container default gateway IPv6 address of the container default gateway
**--default-runtime**="runc"
Set default runtime if there're more than one specified by `--add-runtime`.
**--default-ulimit**=[] **--default-ulimit**=[]
Default ulimits for containers. Default ulimits for containers.