mirror of https://github.com/docker/cli.git
change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
parent
fba8aeb14b
commit
0afb6cc862
|
@ -520,13 +520,13 @@ _docker_create() {
|
||||||
_docker_daemon() {
|
_docker_daemon() {
|
||||||
local boolean_options="
|
local boolean_options="
|
||||||
$global_boolean_options
|
$global_boolean_options
|
||||||
|
--disable-legacy-registry
|
||||||
--help
|
--help
|
||||||
--icc=false
|
--icc=false
|
||||||
--ip-forward=false
|
--ip-forward=false
|
||||||
--ip-masq=false
|
--ip-masq=false
|
||||||
--iptables=false
|
--iptables=false
|
||||||
--ipv6
|
--ipv6
|
||||||
--no-legacy-registry
|
|
||||||
--selinux-enabled
|
--selinux-enabled
|
||||||
--userland-proxy=false
|
--userland-proxy=false
|
||||||
"
|
"
|
||||||
|
|
|
@ -432,6 +432,7 @@ __docker_subcommand() {
|
||||||
"($help)*--dns-search=-[DNS search domains to use]:DNS search: " \
|
"($help)*--dns-search=-[DNS search domains to use]:DNS search: " \
|
||||||
"($help)*--dns-opt=-[DNS options to use]:DNS option: " \
|
"($help)*--dns-opt=-[DNS options to use]:DNS option: " \
|
||||||
"($help)*--default-ulimit=-[Set default ulimit settings for containers]:ulimit: " \
|
"($help)*--default-ulimit=-[Set default ulimit settings for containers]:ulimit: " \
|
||||||
|
"($help)--disable-legacy-registry[Do not contact legacy registries]" \
|
||||||
"($help -e --exec-driver)"{-e,--exec-driver=-}"[Exec driver to use]:driver:(native lxc windows)" \
|
"($help -e --exec-driver)"{-e,--exec-driver=-}"[Exec driver to use]:driver:(native lxc windows)" \
|
||||||
"($help)*--exec-opt=-[Set exec driver options]:exec driver options: " \
|
"($help)*--exec-opt=-[Set exec driver options]:exec driver options: " \
|
||||||
"($help)--exec-root=-[Root of the Docker execdriver]:path:_directories" \
|
"($help)--exec-root=-[Root of the Docker execdriver]:path:_directories" \
|
||||||
|
@ -452,7 +453,6 @@ __docker_subcommand() {
|
||||||
"($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)" \
|
"($help)--log-driver=-[Default driver for container logs]:Logging driver:(json-file syslog journald gelf fluentd awslogs none)" \
|
||||||
"($help)*--log-opt=-[Log driver specific options]:log driver options: " \
|
"($help)*--log-opt=-[Log driver specific options]:log driver options: " \
|
||||||
"($help)--mtu=-[Set the containers network MTU]:mtu:(0 576 1420 1500 9000)" \
|
"($help)--mtu=-[Set the containers network MTU]:mtu:(0 576 1420 1500 9000)" \
|
||||||
"($help)--no-legacy-registry[Do not contact legacy registries]" \
|
|
||||||
"($help -p --pidfile)"{-p,--pidfile=-}"[Path to use for daemon PID file]:PID file:_files" \
|
"($help -p --pidfile)"{-p,--pidfile=-}"[Path to use for daemon PID file]:PID file:_files" \
|
||||||
"($help)*--registry-mirror=-[Preferred Docker registry mirror]:registry mirror: " \
|
"($help)*--registry-mirror=-[Preferred Docker registry mirror]:registry mirror: " \
|
||||||
"($help -s --storage-driver)"{-s,--storage-driver=-}"[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)" \
|
"($help -s --storage-driver)"{-s,--storage-driver=-}"[Storage driver to use]:driver:(aufs devicemapper btrfs zfs overlay)" \
|
||||||
|
|
|
@ -49,7 +49,7 @@ weight=1
|
||||||
--log-driver="json-file" Default driver for container logs
|
--log-driver="json-file" Default driver for container logs
|
||||||
--log-opt=[] Log driver specific options
|
--log-opt=[] Log driver specific options
|
||||||
--mtu=0 Set the containers network MTU
|
--mtu=0 Set the containers network MTU
|
||||||
--no-legacy-registry=false Do not contact legacy registries
|
--disable-legacy-registry=false Do not contact legacy registries
|
||||||
-p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file
|
-p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file
|
||||||
--registry-mirror=[] Preferred Docker registry mirror
|
--registry-mirror=[] Preferred Docker registry mirror
|
||||||
-s, --storage-driver="" Storage driver to use
|
-s, --storage-driver="" Storage driver to use
|
||||||
|
@ -500,7 +500,7 @@ system's list of trusted CAs instead of enabling `--insecure-registry`.
|
||||||
|
|
||||||
## Legacy Registries
|
## Legacy Registries
|
||||||
|
|
||||||
Enabling `--no-legacy-registry` forces a docker daemon to only interact with registries which support the V2 protocol. Specifically, the daemon will not attempt `push`, `pull` and `login` to v1 registries. The exception to this is `search` which can still be performed on v1 registries.
|
Enabling `--disable-legacy-registry` forces a docker daemon to only interact with registries which support the V2 protocol. Specifically, the daemon will not attempt `push`, `pull` and `login` to v1 registries. The exception to this is `search` which can still be performed on v1 registries.
|
||||||
|
|
||||||
## Running a Docker daemon behind a HTTPS_PROXY
|
## Running a Docker daemon behind a HTTPS_PROXY
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ docker-daemon - Enable daemon mode
|
||||||
[**--default-gateway**[=*DEFAULT-GATEWAY*]]
|
[**--default-gateway**[=*DEFAULT-GATEWAY*]]
|
||||||
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
|
[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
|
||||||
[**--default-ulimit**[=*[]*]]
|
[**--default-ulimit**[=*[]*]]
|
||||||
|
[**--disable-legacy-registry**[=*false*]]
|
||||||
[**--dns**[=*[]*]]
|
[**--dns**[=*[]*]]
|
||||||
[**--dns-opt**[=*[]*]]
|
[**--dns-opt**[=*[]*]]
|
||||||
[**--dns-search**[=*[]*]]
|
[**--dns-search**[=*[]*]]
|
||||||
|
@ -37,7 +38,6 @@ docker-daemon - Enable daemon mode
|
||||||
[**--log-driver**[=*json-file*]]
|
[**--log-driver**[=*json-file*]]
|
||||||
[**--log-opt**[=*map[]*]]
|
[**--log-opt**[=*map[]*]]
|
||||||
[**--mtu**[=*0*]]
|
[**--mtu**[=*0*]]
|
||||||
[**--no-legacy-registry**[=*false*]]
|
|
||||||
[**-p**|**--pidfile**[=*/var/run/docker.pid*]]
|
[**-p**|**--pidfile**[=*/var/run/docker.pid*]]
|
||||||
[**--registry-mirror**[=*[]*]]
|
[**--registry-mirror**[=*[]*]]
|
||||||
[**-s**|**--storage-driver**[=*STORAGE-DRIVER*]]
|
[**-s**|**--storage-driver**[=*STORAGE-DRIVER*]]
|
||||||
|
@ -86,6 +86,9 @@ format.
|
||||||
**--default-ulimit**=[]
|
**--default-ulimit**=[]
|
||||||
Set default ulimits for containers.
|
Set default ulimits for containers.
|
||||||
|
|
||||||
|
**--disable-legacy-registry**=*true*|*false*
|
||||||
|
Do not contact legacy registries
|
||||||
|
|
||||||
**--dns**=""
|
**--dns**=""
|
||||||
Force Docker to use specific DNS servers
|
Force Docker to use specific DNS servers
|
||||||
|
|
||||||
|
@ -168,9 +171,6 @@ unix://[/path/to/socket] to use.
|
||||||
**--mtu**=VALUE
|
**--mtu**=VALUE
|
||||||
Set the containers network mtu. Default is `0`.
|
Set the containers network mtu. Default is `0`.
|
||||||
|
|
||||||
**--no-legacy-registry**=*true*|*false*
|
|
||||||
Do not contact legacy registries
|
|
||||||
|
|
||||||
**-p**, **--pidfile**=""
|
**-p**, **--pidfile**=""
|
||||||
Path to use for daemon PID file. Default is `/var/run/docker.pid`
|
Path to use for daemon PID file. Default is `/var/run/docker.pid`
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue