mirror of https://github.com/docker/cli.git
make man/docker.1.md consistent with docker --help
"Options:" listed when you run "docker --help" and "docker daemon --help" do not match the options listed in "man/docker.1.md". This PR makes 'docker --help', 'docker daemon --help' and 'man docker' consistent. Also 2 typo fixes. Signed-off-by: Sally O'Malley <somalley@redhat.com>
This commit is contained in:
parent
ba34adf83a
commit
d1d55cfc9a
|
@ -50,9 +50,15 @@ To see the man page for a command run **man docker <command>**.
|
||||||
**--default-gateway-v6**=""
|
**--default-gateway-v6**=""
|
||||||
IPv6 address of the container default gateway
|
IPv6 address of the container default gateway
|
||||||
|
|
||||||
|
**--default-ulimit**=[]
|
||||||
|
Set default ulimits for containers.
|
||||||
|
|
||||||
**--dns**=""
|
**--dns**=""
|
||||||
Force Docker to use specific DNS servers
|
Force Docker to use specific DNS servers
|
||||||
|
|
||||||
|
**--dns-search**=[]
|
||||||
|
DNS search domains to use.
|
||||||
|
|
||||||
**-e**, **--exec-driver**=""
|
**-e**, **--exec-driver**=""
|
||||||
Force Docker to use specific exec driver. Default is `native`.
|
Force Docker to use specific exec driver. Default is `native`.
|
||||||
|
|
||||||
|
@ -60,7 +66,7 @@ To see the man page for a command run **man docker <command>**.
|
||||||
Set exec driver options. See EXEC DRIVER OPTIONS.
|
Set exec driver options. See EXEC DRIVER OPTIONS.
|
||||||
|
|
||||||
**--exec-root**=""
|
**--exec-root**=""
|
||||||
Path to use as the root of the Docker execdriver. Default is `/var/run/docker`.
|
Path to use as the root of the Docker exec driver. Default is `/var/run/docker`.
|
||||||
|
|
||||||
**--fixed-cidr**=""
|
**--fixed-cidr**=""
|
||||||
IPv4 subnet for fixed IPs (e.g., 10.20.0.0/16); this subnet must be nested in the bridge subnet (which is defined by \-b or \-\-bip)
|
IPv4 subnet for fixed IPs (e.g., 10.20.0.0/16); this subnet must be nested in the bridge subnet (which is defined by \-b or \-\-bip)
|
||||||
|
@ -83,6 +89,9 @@ unix://[/path/to/socket] to use.
|
||||||
**--icc**=*true*|*false*
|
**--icc**=*true*|*false*
|
||||||
Allow unrestricted inter\-container and Docker daemon host communication. If disabled, containers can still be linked together using **--link** option (see **docker-run(1)**). Default is true.
|
Allow unrestricted inter\-container and Docker daemon host communication. If disabled, containers can still be linked together using **--link** option (see **docker-run(1)**). Default is true.
|
||||||
|
|
||||||
|
**--insecure-registry**=[]
|
||||||
|
Enable insecure registry communication.
|
||||||
|
|
||||||
**--ip**=""
|
**--ip**=""
|
||||||
Default IP address to use when binding container ports. Default is `0.0.0.0`.
|
Default IP address to use when binding container ports. Default is `0.0.0.0`.
|
||||||
|
|
||||||
|
@ -131,10 +140,19 @@ unix://[/path/to/socket] to use.
|
||||||
**--storage-opt**=[]
|
**--storage-opt**=[]
|
||||||
Set storage driver options. See STORAGE DRIVER OPTIONS.
|
Set storage driver options. See STORAGE DRIVER OPTIONS.
|
||||||
|
|
||||||
**-tls**=*true*|*false*
|
**--tls**=*true*|*false*
|
||||||
Use TLS; implied by --tlsverify. Default is false.
|
Use TLS; implied by --tlsverify. Default is false.
|
||||||
|
|
||||||
**-tlsverify**=*true*|*false*
|
**--tlscacert**=~/.docker/ca.pem
|
||||||
|
Trust certs signed only by this CA.
|
||||||
|
|
||||||
|
**--tlscert**=~/.docker/cert.pem
|
||||||
|
Path to TLS certificate file.
|
||||||
|
|
||||||
|
**--tlskey**=~/.docker/key.pem
|
||||||
|
Path to TLS key file.
|
||||||
|
|
||||||
|
**--tlsverify**=*true*|*false*
|
||||||
Use TLS and verify the remote (daemon: verify client, client: verify daemon).
|
Use TLS and verify the remote (daemon: verify client, client: verify daemon).
|
||||||
Default is false.
|
Default is false.
|
||||||
|
|
||||||
|
@ -242,6 +260,10 @@ inside it)
|
||||||
Push an image or a repository to a Docker Registry
|
Push an image or a repository to a Docker Registry
|
||||||
See **docker-push(1)** for full documentation on the **push** command.
|
See **docker-push(1)** for full documentation on the **push** command.
|
||||||
|
|
||||||
|
**rename**
|
||||||
|
Rename a container.
|
||||||
|
See **docker-rename(1)** for full documentation on the **rename** command.
|
||||||
|
|
||||||
**restart**
|
**restart**
|
||||||
Restart a running container
|
Restart a running container
|
||||||
See **docker-restart(1)** for full documentation on the **restart** command.
|
See **docker-restart(1)** for full documentation on the **restart** command.
|
||||||
|
@ -411,7 +433,7 @@ Example use: `docker -d --storage-opt dm.loopdatasize=200G`
|
||||||
**Note**: This option configures devicemapper loopback, which should not be used in production.
|
**Note**: This option configures devicemapper loopback, which should not be used in production.
|
||||||
|
|
||||||
Specifies the size to use when creating the loopback file for the
|
Specifies the size to use when creating the loopback file for the
|
||||||
"metadadata" device which is used for the thin pool. The default size
|
"metadata" device which is used for the thin pool. The default size
|
||||||
is 2G. The file is sparse, so it will not initially take up
|
is 2G. The file is sparse, so it will not initially take up
|
||||||
this much space.
|
this much space.
|
||||||
|
|
||||||
|
@ -473,7 +495,7 @@ When `udev` sync support is `true`, then `devicemapper` and `udev` can
|
||||||
coordinate the activation and deactivation of devices for containers.
|
coordinate the activation and deactivation of devices for containers.
|
||||||
|
|
||||||
When `udev` sync support is `false`, a race condition occurs between
|
When `udev` sync support is `false`, a race condition occurs between
|
||||||
the`devicemapper` and `udev` during create and cleanup. The race
|
the `devicemapper` and `udev` during create and cleanup. The race
|
||||||
condition results in errors and failures. (For information on these
|
condition results in errors and failures. (For information on these
|
||||||
failures, see
|
failures, see
|
||||||
[docker#4036](https://github.com/docker/docker/issues/4036))
|
[docker#4036](https://github.com/docker/docker/issues/4036))
|
||||||
|
|
Loading…
Reference in New Issue