Rebase & update api doc v1.18 instead

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

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

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"