docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated 

docs: --api-enable-cors is deprecated,updated docs description
This commit is contained in:
moxiegirl 2015-03-11 15:28:28 -07:00
parent 5b5b09275e 0648e59ad8
commit cc4095a18c
4 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/bash/docker
View File

@ -189,7 +189,6 @@ __docker_signals() {
_docker_docker() { _docker_docker() {
local boolean_options=" local boolean_options="
--api-enable-cors
--daemon -d --daemon -d
--debug -D --debug -D
--help -h --help -h
@ -973,6 +972,7 @@ _docker() {
) )
local main_options_with_args=" local main_options_with_args="
--api-cors-header
--bip --bip
--bridge -b --bridge -b
--default-ulimit --default-ulimit

2
contrib/completion/fish/docker.fish
View File

@ -43,7 +43,7 @@ function __fish_print_docker_repositories --description 'Print a list of docker
end end
# common options # common options
complete -c docker -f -n '__fish_docker_no_subcommand' -l api-enable-cors -d 'Enable CORS headers in the remote API' complete -c docker -f -n '__fish_docker_no_subcommand' -l api-cors-header -d "Set CORS headers in the remote API. Default is cors disabled"
complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge' complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge'
complete -c docker -f -n '__fish_docker_no_subcommand' -l bip -d "Use this CIDR notation address for the network bridge's IP, not compatible with -b" complete -c docker -f -n '__fish_docker_no_subcommand' -l bip -d "Use this CIDR notation address for the network bridge's IP, not compatible with -b"
complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode' complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode'

3
docs/man/docker.1.md
View File

@ -34,9 +34,6 @@ unix://[/path/to/socket] to use.
The socket(s) to bind to in daemon mode specified using one or more The socket(s) to bind to in daemon mode specified using one or more
tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd. tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
**--api-enable-cors**=*true*|*false*
Enable CORS headers in the remote API. Default is false.
**--api-cors-header**="" **--api-cors-header**=""
Set CORS headers in the remote API. Default is cors disabled. Give urls like "http://foo, http://bar, ...". Give "*" to allow all. Set CORS headers in the remote API. Default is cors disabled. Give urls like "http://foo, http://bar, ...". Give "*" to allow all.

1
docs/sources/reference/commandline/cli.md
View File

@ -74,7 +74,6 @@ expect an integer, and they can only be specified once.
A self-sufficient runtime for linux containers. A self-sufficient runtime for linux containers.
Options: Options:
--api-enable-cors=false Enable CORS headers in the remote API
--api-cors-header="" Set CORS headers in the remote API --api-cors-header="" Set CORS headers in the remote API
-b, --bridge="" Attach containers to a network bridge -b, --bridge="" Attach containers to a network bridge
--bip="" Specify network bridge IP --bip="" Specify network bridge IP