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

Merge pull request #16769 from LK4D4/fix_volume_socket

Browse Source 
Allocate resources for server API before daemon creation
Upstream-commit: 80f2e3f0c6d8c439ba0d4b53162dcf1610ad2d46
Component: engine
This commit is contained in:
Vincent Demeester
2015-10-05 20:48:41 +02:00
parent b9a953d801 c12ca2de3a
commit 0eed66fc40
5 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/engine/docker/daemon.go
View File

@ -223,6 +223,17 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
}
serverConfig.TLSConfig = tlsConfig
}
for _, protoAddr := range commonFlags.Hosts {
protoAddrParts := strings.SplitN(protoAddr, "://", 2)
if len(protoAddrParts) != 2 {
logrus.Fatalf("bad format %s, expected PROTO://ADDR", protoAddr)
}
serverConfig.Addrs = append(serverConfig.Addrs, apiserver.Addr{Proto: protoAddrParts[0], Addr: protoAddrParts[1]})
}
api, err := apiserver.New(serverConfig)
if err != nil {
logrus.Fatal(err)
}
if err := migrateKey(); err != nil {
logrus.Fatal(err)
@ -249,7 +260,6 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
"graphdriver": d.GraphDriver().String(),
}).Info("Docker daemon")
api := apiserver.New(serverConfig)
api.InitRouters(d)
// The serve API routine never exits unless an error occurs
@ -257,7 +267,7 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
// daemon doesn't exit
serveAPIWait := make(chan error)
go func() {
if err := api.ServeAPI(commonFlags.Hosts); err != nil {
if err := api.ServeAPI(); err != nil {
logrus.Errorf("ServeAPI error: %v", err)
serveAPIWait <- err
return