Skip to content

Commit

Permalink
Add missing "--default-runtime" flag in manpage
Browse files Browse the repository at this point in the history
Add missing flag and more descriptions in manpage.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
  • Loading branch information
WeiZhang555 committed Dec 22, 2016
1 parent 545b97e commit 977fd43
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 11 deletions.
22 changes: 12 additions & 10 deletions docs/reference/commandline/dockerd.md
Expand Up @@ -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:

```json
"default-runtime": "runc",
"runtimes": {
"runc": {
"path": "runc"
},
"custom": {
"path": "/usr/local/bin/my-runc-replacement",
"runtimeArgs": [
"--debug"
]
{
"default-runtime": "runc",
"runtimes": {
"runc": {
"path": "runc"
},
"custom": {
"path": "/usr/local/bin/my-runc-replacement",
"runtimeArgs": [
"--debug"
]
}
}
}
```
Expand Down
34 changes: 33 additions & 1 deletion man/dockerd.8.md
Expand Up @@ -20,6 +20,7 @@ dockerd - Enable daemon mode
[**-D**|**--debug**]
[**--default-gateway**[=*DEFAULT-GATEWAY*]]
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
[**--default-runtime**[=*runc*]]
[**--default-ulimit**[=*[]*]]
[**--disable-legacy-registry**]
[**--dns**[=*[]*]]
Expand Down Expand Up @@ -84,7 +85,35 @@ following format.
# OPTIONS

**--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**=""
Set CORS headers in the Engine API. Default is cors disabled. Give urls like
Expand Down Expand Up @@ -132,6 +161,9 @@ following format.
**--default-gateway-v6**=""
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 ulimits for containers.

Expand Down

0 comments on commit 977fd43

Please sign in to comment.