mirror of https://github.com/docker/cli.git
Remove exec-driver global daemon option.
Each platform has only a driver now. Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
parent
c5ed875bd9
commit
f9b805f16f
|
@ -659,7 +659,6 @@ _docker_daemon() {
|
||||||
--dns
|
--dns
|
||||||
--dns-search
|
--dns-search
|
||||||
--dns-opt
|
--dns-opt
|
||||||
--exec-driver -e
|
|
||||||
--exec-opt
|
--exec-opt
|
||||||
--exec-root
|
--exec-root
|
||||||
--fixed-cidr
|
--fixed-cidr
|
||||||
|
|
|
@ -51,7 +51,6 @@ complete -c docker -f -n '__fish_docker_no_subcommand' -s d -l daemon -d 'Enable
|
||||||
complete -c docker -f -n '__fish_docker_no_subcommand' -l dns -d 'Force Docker to use specific DNS servers'
|
complete -c docker -f -n '__fish_docker_no_subcommand' -l dns -d 'Force Docker to use specific DNS servers'
|
||||||
complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-opt -d 'Force Docker to use specific DNS options'
|
complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-opt -d 'Force Docker to use specific DNS options'
|
||||||
complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-search -d 'Force Docker to use specific DNS search domains'
|
complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-search -d 'Force Docker to use specific DNS search domains'
|
||||||
complete -c docker -f -n '__fish_docker_no_subcommand' -s e -l exec-driver -d 'Force the Docker runtime to use a specific exec driver'
|
|
||||||
complete -c docker -f -n '__fish_docker_no_subcommand' -l exec-opt -d 'Set exec driver options'
|
complete -c docker -f -n '__fish_docker_no_subcommand' -l exec-opt -d 'Set exec driver options'
|
||||||
complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr -d 'IPv4 subnet for fixed IPs (e.g. 10.20.0.0/16)'
|
complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr -d 'IPv4 subnet for fixed IPs (e.g. 10.20.0.0/16)'
|
||||||
complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr-v6 -d 'IPv6 subnet for fixed IPs (e.g.: 2001:a02b/48)'
|
complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr-v6 -d 'IPv6 subnet for fixed IPs (e.g.: 2001:a02b/48)'
|
||||||
|
|
|
@ -540,7 +540,6 @@ __docker_subcommand() {
|
||||||
"($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)--disable-legacy-registry[Do not contact legacy registries]" \
|
||||||
"($help -e --exec-driver)"{-e=,--exec-driver=}"[Exec driver to use]:driver:(native 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" \
|
||||||
"($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \
|
"($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \
|
||||||
|
|
|
@ -29,7 +29,6 @@ weight = -1
|
||||||
--dns-opt=[] DNS options to use
|
--dns-opt=[] DNS options to use
|
||||||
--dns-search=[] DNS search domains to use
|
--dns-search=[] DNS search domains to use
|
||||||
--default-ulimit=[] Set default ulimit settings for containers
|
--default-ulimit=[] Set default ulimit settings for containers
|
||||||
-e, --exec-driver="native" Exec driver to use
|
|
||||||
--exec-opt=[] Set exec driver options
|
--exec-opt=[] Set exec driver options
|
||||||
--exec-root="/var/run/docker" Root of the Docker execdriver
|
--exec-root="/var/run/docker" Root of the Docker execdriver
|
||||||
--fixed-cidr="" IPv4 subnet for fixed IPs
|
--fixed-cidr="" IPv4 subnet for fixed IPs
|
||||||
|
|
|
@ -20,7 +20,6 @@ docker-daemon - Enable daemon mode
|
||||||
[**--dns**[=*[]*]]
|
[**--dns**[=*[]*]]
|
||||||
[**--dns-opt**[=*[]*]]
|
[**--dns-opt**[=*[]*]]
|
||||||
[**--dns-search**[=*[]*]]
|
[**--dns-search**[=*[]*]]
|
||||||
[**-e**|**--exec-driver**[=*native*]]
|
|
||||||
[**--exec-opt**[=*[]*]]
|
[**--exec-opt**[=*[]*]]
|
||||||
[**--exec-root**[=*/var/run/docker*]]
|
[**--exec-root**[=*/var/run/docker*]]
|
||||||
[**--fixed-cidr**[=*FIXED-CIDR*]]
|
[**--fixed-cidr**[=*FIXED-CIDR*]]
|
||||||
|
@ -112,9 +111,6 @@ format.
|
||||||
**--dns-search**=[]
|
**--dns-search**=[]
|
||||||
DNS search domains to use.
|
DNS search domains to use.
|
||||||
|
|
||||||
**-e**, **--exec-driver**=""
|
|
||||||
Force Docker to use specific exec driver. Default is `native`.
|
|
||||||
|
|
||||||
**--exec-opt**=[]
|
**--exec-opt**=[]
|
||||||
Set exec driver options. See EXEC DRIVER OPTIONS.
|
Set exec driver options. See EXEC DRIVER OPTIONS.
|
||||||
|
|
||||||
|
|
|
@ -225,8 +225,8 @@ inside it)
|
||||||
|
|
||||||
# EXEC DRIVER OPTIONS
|
# EXEC DRIVER OPTIONS
|
||||||
|
|
||||||
Use the **--exec-opt** flags to specify options to the exec-driver. The only
|
Use the **--exec-opt** flags to specify options to the execution driver. The only
|
||||||
driver that accepts this flag is the *native* (libcontainer) driver. As a
|
runtime that accepts any options is Linux. As a
|
||||||
result, you must also specify **-s=**native for this option to have effect. The
|
result, you must also specify **-s=**native for this option to have effect. The
|
||||||
following is the only *native* option:
|
following is the only *native* option:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue