Don't hard code true for auth job

Michael Crosby · tiborvass · commit afade4236d3f · 2014-10-30T19:41:55.000-04:00
Signed-off-by: Michael Crosby &lt;michael@docker.com&gt;

Conflicts:
	registry/service.go
diff --git a/builtins/builtins.go b/builtins/builtins.go
@@ -10,7 +10,6 @@ import (
 	"github.com/docker/docker/engine"
 	"github.com/docker/docker/events"
 	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/docker/registry"
 )
 
 func Register(eng *engine.Engine) error {
@@ -26,7 +25,8 @@ func Register(eng *engine.Engine) error {
 	if err := eng.Register("version", dockerVersion); err != nil {
 		return err
 	}
-	return registry.NewService().Install(eng)
+
+	return nil
 }
 
 // remote: a RESTful api for cross-docker communication
diff --git a/docker/daemon.go b/docker/daemon.go
@@ -13,6 +13,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
@@ -32,11 +33,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
diff --git a/registry/service.go b/registry/service.go
@@ -13,12 +13,15 @@ import (
 //  'pull': Download images from any registry (TODO)
 //  'push': Upload images to any registry (TODO)
 type Service struct {
+	insecureRegistries []string
 }
 
 // NewService returns a new instance of Service ready to be
 // installed no an engine.
-func NewService() *Service {
-	return &Service{}
+func NewService(insecureRegistries []string) *Service {
+	return &Service{
+		insecureRegistries: insecureRegistries,
+	}
 }
 
 // Install installs registry capabilities to eng.
@@ -32,15 +35,12 @@ func (s *Service) Install(eng *engine.Engine) error {
 // and returns OK if authentication was sucessful.
 // It can be used to verify the validity of a client's credentials.
 func (s *Service) Auth(job *engine.Job) engine.Status {
-	var (
-		err        error
-		authConfig = &AuthConfig{}
-	)
+	var authConfig = new(AuthConfig)
 
 	job.GetenvJson("authConfig", authConfig)
-	// TODO: this is only done here because auth and registry need to be merged into one pkg
+
 	if addr := authConfig.ServerAddress; addr != "" && addr != IndexServerAddress() {
-		endpoint, err := NewEndpoint(addr, true)
+		endpoint, err := NewEndpoint(addr, IsSecure(addr, s.insecureRegistries))
 		if err != nil {
 			return job.Error(err)
 		}
@@ -49,11 +49,11 @@ func (s *Service) Auth(job *engine.Job) engine.Status {
 		}
 		authConfig.ServerAddress = endpoint.String()
 	}
-	status, err := Login(authConfig, HTTPRequestFactory(nil))
-	if err != nil {
+
+	if _, err := Login(authConfig, HTTPRequestFactory(nil)); err != nil {
 		return job.Error(err)
 	}
-	job.Printf("%s\n", status)
+
 	return engine.StatusOK
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"github.com/docker/docker/engine"`
`11`	`11`	`"github.com/docker/docker/events"`
`12`	`12`	`"github.com/docker/docker/pkg/parsers/kernel"`
`13`		`- "github.com/docker/docker/registry"`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`func Register(eng *engine.Engine) error {`
`@@ -26,7 +25,8 @@ func Register(eng *engine.Engine) error {`
`26`	`25`	`if err := eng.Register("version", dockerVersion); err != nil {`
`27`	`26`	`return err`
`28`	`27`	`}`
`29`		`- return registry.NewService().Install(eng)`
	`28`	`+`
	`29`	`+ return nil`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// remote: a RESTful api for cross-docker communication`