p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase & update api doc v1.18 instead

Browse Source 
Signed-off-by: harry zhang <resouer@163.com>
Upstream-commit: dc0a6c1f5edd78d23ab676c54c3e84df3c2b2bbf
Component: engine
This commit is contained in:
resouer
2015-02-27 05:38:16 +00:00
committed by resouer
parent f947fbc4ae
commit d382609cd2
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/api/server/server_linux.go
View File

@ -27,7 +27,7 @@ func NewServer(proto, addr string, job *engine.Job) (Server, error) {
}
func setupUnixHttp(addr string, job *engine.Job) (*HttpServer, error) {
r := createRouter(job.Eng, job.GetenvBool("Logging"), job.GetenvBool("EnableCors"), job.Getenv("CorsHeaders"), job.Getenv("Version"))
r := createRouter(job.Eng, job.GetenvBool("Logging"), job.GetenvBool("EnableCors"), job.Getenv("CorsHeaders"), job.Getenv("Version"))
if err := syscall.Unlink(addr); err != nil && !os.IsNotExist(err) {
return nil, err

2
components/engine/daemon/config.go
View File

@ -69,7 +69,7 @@ func (config *Config) InstallFlags() {
flag.BoolVar(&config.EnableSelinuxSupport, []string{"-selinux-enabled"}, false, "Enable selinux support")
flag.IntVar(&config.Mtu, []string{"#mtu", "-mtu"}, 0, "Set the containers network MTU")
flag.StringVar(&config.SocketGroup, []string{"G", "-group"}, "docker", "Group for the unix socket")
flag.BoolVar(&config.EnableCors, []string{"#api-enable-cors", "#-api-enable-cors"}, false, "Enable CORS headers in the remote API")
flag.BoolVar(&config.EnableCors, []string{"#api-enable-cors", "#-api-enable-cors"}, false, "Enable CORS headers in the remote API, this is deprecated by --api-cors-header")
flag.StringVar(&config.CorsHeaders, []string{"-api-cors-header"}, "", "Set CORS headers in the remote API")
opts.IPVar(&config.DefaultIp, []string{"#ip", "-ip"}, "0.0.0.0", "Default IP when binding container ports")
opts.ListVar(&config.GraphOptions, []string{"-storage-opt"}, "Set storage driver options")

2
components/engine/docs/sources/reference/api/docker_remote_api_v1.17.md
View File

@ -1971,4 +1971,4 @@ This might change in the future.
To set cross origin requests to the remote api, please add flag "--api-enable-cors"
when running docker in daemon mode.
$ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
$ docker -d -H="192.168.1.9:2375" --api-enable-cors

7
components/engine/docs/sources/reference/api/docker_remote_api_v1.18.md
View File

@ -1975,7 +1975,8 @@ This might change in the future.
## 3.3 CORS Requests
To enable cross origin requests to the remote api add the flag
"--api-enable-cors" when running docker in daemon mode.
To set cross origin requests to the remote api please give values to
"--api-cors-header" when running docker in daemon mode. Set * will allow all,
default or blank means CORS disabled
$ docker -d -H="192.168.1.9:2375" --api-enable-cors
$ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"