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

add --api-enable-cors on swarm manage 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2014-12-06 23:03:59 +00:00
parent 496377d998
commit 926e8e11f1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/api.go
View File

@ -349,7 +349,7 @@ func createRouter(c *context, enableCors bool) (*mux.Router, error) {
return r, nil
}
func ListenAndServe(c *cluster.Cluster, s *scheduler.Scheduler, addr, version string) error {
func ListenAndServe(c *cluster.Cluster, s *scheduler.Scheduler, addr, version string, enableCors bool) error {
context := &context{
cluster: c,
scheduler: s,
@ -357,7 +357,7 @@ func ListenAndServe(c *cluster.Cluster, s *scheduler.Scheduler, addr, version st
eventsHandler: NewEventsHandler(),
}
c.Events(context.eventsHandler)
r, err := createRouter(context, false)
r, err := createRouter(context, enableCors)
if err != nil {
return err
}

6
main.go
View File

@ -50,6 +50,10 @@ func main() {
Value: 25,
Usage: "time in second between each heartbeat",
}
flEnableCors := cli.BoolFlag{
Name: "api-enable-cors, cors",
Usage: "enable CORS headers in the remote API",
}
app.Commands = []cli.Command{
{
@ -87,7 +91,7 @@ func main() {
Name: "manage",
ShortName: "m",
Usage: "manage a docker cluster",
Flags: []cli.Flag{flToken, flAddr, flHeartBeat},
Flags: []cli.Flag{flToken, flAddr, flHeartBeat, flEnableCors},
Action: manage,
},
{

2
manage.go
View File

@ -82,5 +82,5 @@ func manage(c *cli.Context) {
},
)
log.Fatal(api.ListenAndServe(cluster, s, c.String("addr"), c.App.Version))
log.Fatal(api.ListenAndServe(cluster, s, c.String("addr"), c.App.Version, c.Bool("cors")))
}