Don't hard code true for auth job

Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	registry/service.go
Upstream-commit: f43e77fc125840f40af52da01cd2a62bca49765e
Component: engine
This commit is contained in:
Michael Crosby
2014-08-20 08:31:24 -07:00
committed by Tibor Vass
parent 0184acc7f9
commit b4b8037ecd
3 changed files with 20 additions and 13 deletions

View File

@ -14,6 +14,7 @@ import (
"github.com/docker/docker/engine"
flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/signal"
"github.com/docker/docker/registry"
)
const CanDaemon = true
@ -33,11 +34,17 @@ func mainDaemon() {
}
eng := engine.New()
signal.Trap(eng.Shutdown)
// Load builtins
if err := builtins.Register(eng); err != nil {
log.Fatal(err)
}
// load registry service
if err := registry.NewService(daemonCfg.InsecureRegistries).Install(eng); err != nil {
log.Fatal(err)
}
// load the daemon in the background so we can immediately start
// the http api so that connections don't fail while the daemon
// is booting