1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #15259 from sallyom/manFixes

make man/docker.1.md consistent with docker --help
This commit is contained in:
moxiegirl 2015-08-04 08:34:52 -07:00
commit be07c53d2d

View file

@ -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`.
@ -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.