Merge pull request #16807 from jfrazelle/rename-flag

change flag name to better follow the other flags that start with disable
This commit is contained in:
Jess Frazelle
2015-10-07 10:40:32 -07:00
7 changed files with 23 additions and 22 deletions
+5 -5
View File
@@ -13,6 +13,7 @@ docker-daemon - Enable daemon mode
[**--default-gateway**[=*DEFAULT-GATEWAY*]]
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
[**--default-ulimit**[=*[]*]]
[**--disable-legacy-registry**[=*false*]]
[**--dns**[=*[]*]]
[**--dns-opt**[=*[]*]]
[**--dns-search**[=*[]*]]
@@ -37,7 +38,6 @@ docker-daemon - Enable daemon mode
[**--log-driver**[=*json-file*]]
[**--log-opt**[=*map[]*]]
[**--mtu**[=*0*]]
[**--no-legacy-registry**[=*false*]]
[**-p**|**--pidfile**[=*/var/run/docker.pid*]]
[**--registry-mirror**[=*[]*]]
[**-s**|**--storage-driver**[=*STORAGE-DRIVER*]]
@@ -86,6 +86,9 @@ format.
**--default-ulimit**=[]
Set default ulimits for containers.
**--disable-legacy-registry**=*true*|*false*
Do not contact legacy registries
**--dns**=""
Force Docker to use specific DNS servers
@@ -133,7 +136,7 @@ unix://[/path/to/socket] to use.
List of insecure registries can contain an element with CIDR notation to specify a whole subnet. Insecure registries accept HTTP and/or accept HTTPS with certificates from unknown CAs.
Enabling `--insecure-registry` is useful when running a local registry. However, because its use creates security vulnerabilities it should ONLY be enabled for testing purposes. For increased security, users should add their CA to their system's list of trusted CAs instead of using `--insecure-registry`.
Enabling `--insecure-registry` is useful when running a local registry. However, because its use creates security vulnerabilities it should ONLY be enabled for testing purposes. For increased security, users should add their CA to their system's list of trusted CAs instead of using `--insecure-registry`.
**--ip**=""
Default IP address to use when binding container ports. Default is `0.0.0.0`.
@@ -168,9 +171,6 @@ unix://[/path/to/socket] to use.
**--mtu**=VALUE
Set the containers network mtu. Default is `0`.
**--no-legacy-registry**=*true*|*false*
Do not contact legacy registries
**-p**, **--pidfile**=""
Path to use for daemon PID file. Default is `/var/run/docker.pid`