Merge pull request #10586 from resouer/10532-fix-cors-hardcode

Fix 10532 to change --api-enable-cors to string.
This commit is contained in:
Jessie Frazelle
2015-03-04 18:42:20 +00:00
8 changed files with 34 additions and 18 deletions
@@ -1968,7 +1968,7 @@ 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 add flag "--api-enable-cors"
when running docker in daemon mode.
$ docker -d -H="192.168.1.9:2375" --api-enable-cors
$ docker -d -H="192.168.1.9:2375" --api-enable-cors
@@ -1983,7 +1983,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"
@@ -75,6 +75,7 @@ expect an integer, and they can only be specified once.
Options:
--api-enable-cors=false Enable CORS headers in the remote API
--api-cors-header="" Set CORS headers in the remote API
-b, --bridge="" Attach containers to a network bridge
--bip="" Specify network bridge IP
-D, --debug=false Enable debug mode