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

Fix the incorrect option name 

Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
This commit is contained in:
yuexiao-wang 2016-12-14 03:58:02 +08:00 committed by Tibor Vass
parent d408f74d07
commit 4df2866d4e
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/docker-build.1.md
View File

@ -129,7 +129,7 @@ set as the **URL**, the repository is cloned locally and then sent as the contex
`k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a
unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap. unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
**--network**=*NETWORK* **--network**=*bridge*
Set the networking mode for the RUN instructions during build. Supported standard Set the networking mode for the RUN instructions during build. Supported standard
values are: `bridge`, `host`, `none` and `container:<name|id>`. Any other value values are: `bridge`, `host`, `none` and `container:<name|id>`. Any other value
is taken as a custom network's name or ID which this container should connect to. is taken as a custom network's name or ID which this container should connect to.

8
man/docker-create.1.md
View File

@ -222,12 +222,12 @@ two memory nodes.
**--ip**="" **--ip**=""
Sets the container's interface IPv4 address (e.g. 172.23.0.9) Sets the container's interface IPv4 address (e.g. 172.23.0.9)
It can only be used in conjunction with **--net** for user-defined networks It can only be used in conjunction with **--network** for user-defined networks
**--ip6**="" **--ip6**=""
Sets the container's interface IPv6 address (e.g. 2001:db8::1b99) Sets the container's interface IPv6 address (e.g. 2001:db8::1b99)
It can only be used in conjunction with **--net** for user-defined networks It can only be used in conjunction with **--network** for user-defined networks
**--ipc**="" **--ipc**=""
Default is to create a private IPC namespace (POSIX SysV IPC) for the container Default is to create a private IPC namespace (POSIX SysV IPC) for the container
@ -305,7 +305,7 @@ unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
**--name**="" **--name**=""
Assign a name to the container Assign a name to the container
**--net**="*bridge*" **--network**="*bridge*"
Set the Network mode for the container Set the Network mode for the container
'bridge': create a network stack on the default Docker bridge 'bridge': create a network stack on the default Docker bridge
'none': no networking 'none': no networking
@ -404,7 +404,7 @@ unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
Network Namespace - current sysctls allowed: Network Namespace - current sysctls allowed:
Sysctls beginning with net.* Sysctls beginning with net.*
Note: if you use --net=host using these sysctls will not be allowed. Note: if you use --network=host using these sysctls will not be allowed.
**-t**, **--tty**=*true*|*false* **-t**, **--tty**=*true*|*false*
Allocate a pseudo-TTY. The default is *false*. Allocate a pseudo-TTY. The default is *false*.

4
man/docker-network-connect.1.md
View File

@ -19,10 +19,10 @@ the same network.
$ docker network connect multi-host-network container1 $ docker network connect multi-host-network container1
``` ```
You can also use the `docker run --net=<network-name>` option to start a container and immediately connect it to a network. You can also use the `docker run --network=<network-name>` option to start a container and immediately connect it to a network.
```bash ```bash
$ docker run -itd --net=multi-host-network --ip 172.20.88.22 --ip6 2001:db8::8822 busybox $ docker run -itd --network=multi-host-network --ip 172.20.88.22 --ip6 2001:db8::8822 busybox
``` ```
You can pause, restart, and stop containers that are connected to a network. You can pause, restart, and stop containers that are connected to a network.
A container connects to its configured networks when it runs. A container connects to its configured networks when it runs.

4
man/docker-network-create.1.md
View File

@ -73,11 +73,11 @@ name conflicts.
## Connect containers ## Connect containers
When you start a container use the `--net` flag to connect it to a network. When you start a container use the `--network` flag to connect it to a network.
This adds the `busybox` container to the `mynet` network. This adds the `busybox` container to the `mynet` network.
```bash ```bash
$ docker run -itd --net=mynet busybox $ docker run -itd --network=mynet busybox
``` ```
If you want to add a container to a network after the container is already If you want to add a container to a network after the container is already

6
man/docker-run.1.md
View File

@ -319,12 +319,12 @@ redirection on the host system.
**--ip**="" **--ip**=""
Sets the container's interface IPv4 address (e.g. 172.23.0.9) Sets the container's interface IPv4 address (e.g. 172.23.0.9)
It can only be used in conjunction with **--net** for user-defined networks It can only be used in conjunction with **--network** for user-defined networks
**--ip6**="" **--ip6**=""
Sets the container's interface IPv6 address (e.g. 2001:db8::1b99) Sets the container's interface IPv6 address (e.g. 2001:db8::1b99)
It can only be used in conjunction with **--net** for user-defined networks It can only be used in conjunction with **--network** for user-defined networks
**--ipc**="" **--ipc**=""
Default is to create a private IPC namespace (POSIX SysV IPC) for the container Default is to create a private IPC namespace (POSIX SysV IPC) for the container
@ -557,7 +557,7 @@ incompatible with any restart policy other than `none`.
Network Namespace - current sysctls allowed: Network Namespace - current sysctls allowed:
Sysctls beginning with net.* Sysctls beginning with net.*
If you use the `--net=host` option these sysctls will not be allowed. If you use the `--network=host` option these sysctls will not be allowed.
**--sig-proxy**=*true*|*false* **--sig-proxy**=*true*|*false*
Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied. The default is *true*. Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied. The default is *true*.