diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index fb17b0ec29..12a267eb65 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -659,7 +659,6 @@ _docker_daemon() { --dns --dns-search --dns-opt - --exec-driver -e --exec-opt --exec-root --fixed-cidr diff --git a/contrib/completion/fish/docker.fish b/contrib/completion/fish/docker.fish index 15cde66f02..ac2167b49e 100644 --- a/contrib/completion/fish/docker.fish +++ b/contrib/completion/fish/docker.fish @@ -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-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' -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 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)' diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 7beb44f278..0f1a0f66a1 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -540,7 +540,6 @@ __docker_subcommand() { "($help)*--dns-opt=[DNS options to use]:DNS option: " \ "($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 windows)" \ "($help)*--exec-opt=[Set exec driver options]:exec driver options: " \ "($help)--exec-root=[Root of the Docker execdriver]:path:_directories" \ "($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \ diff --git a/docs/reference/commandline/daemon.md b/docs/reference/commandline/daemon.md index 6da89e6b49..8e3200d0ac 100644 --- a/docs/reference/commandline/daemon.md +++ b/docs/reference/commandline/daemon.md @@ -29,7 +29,6 @@ weight = -1 --dns-opt=[] DNS options to use --dns-search=[] DNS search domains to use --default-ulimit=[] Set default ulimit settings for containers - -e, --exec-driver="native" Exec driver to use --exec-opt=[] Set exec driver options --exec-root="/var/run/docker" Root of the Docker execdriver --fixed-cidr="" IPv4 subnet for fixed IPs diff --git a/man/docker-daemon.8.md b/man/docker-daemon.8.md index b85a9a76fa..c16d4d352a 100644 --- a/man/docker-daemon.8.md +++ b/man/docker-daemon.8.md @@ -20,7 +20,6 @@ docker-daemon - Enable daemon mode [**--dns**[=*[]*]] [**--dns-opt**[=*[]*]] [**--dns-search**[=*[]*]] -[**-e**|**--exec-driver**[=*native*]] [**--exec-opt**[=*[]*]] [**--exec-root**[=*/var/run/docker*]] [**--fixed-cidr**[=*FIXED-CIDR*]] @@ -112,9 +111,6 @@ format. **--dns-search**=[] DNS search domains to use. -**-e**, **--exec-driver**="" - Force Docker to use specific exec driver. Default is `native`. - **--exec-opt**=[] Set exec driver options. See EXEC DRIVER OPTIONS. diff --git a/man/docker.1.md b/man/docker.1.md index 18df3b5cf2..eaed589df7 100644 --- a/man/docker.1.md +++ b/man/docker.1.md @@ -225,8 +225,8 @@ inside it) # EXEC DRIVER OPTIONS -Use the **--exec-opt** flags to specify options to the exec-driver. The only -driver that accepts this flag is the *native* (libcontainer) driver. As a +Use the **--exec-opt** flags to specify options to the execution driver. The only +runtime that accepts any options is Linux. As a result, you must also specify **-s=**native for this option to have effect. The following is the only *native* option: