kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #16865 from MHBauer/registry-service-refactor

Browse source 
refactor away direct references to daemon member
This commit is contained in:
Vincent Demeester 2015-10-11 21:47:58 +02:00
commit 6e12d9fe62
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/server/router/local/auth.go
View file

@ -17,7 +17,7 @@ func (s *router) postAuth(ctx context.Context, w http.ResponseWriter, r *http.Re
if err != nil { if err != nil {
return err return err
} }
status, err := s.daemon.RegistryService.Auth(config) status, err := s.daemon.AuthenticateToRegistry(config)
if err != nil { if err != nil {
return err return err
} }

2
api/server/router/local/image.go
View file

@ -512,7 +512,7 @@ func (s *router) getImagesSearch(ctx context.Context, w http.ResponseWriter, r *
headers[k] = v headers[k] = v
} }
} }
query, err := s.daemon.RegistryService.Search(r.Form.Get("term"), config, headers) query, err := s.daemon.SearchRegistryForImages(r.Form.Get("term"), config, headers)
if err != nil { if err != nil {
return err return err
} }

19
daemon/daemon.go
View file

@ -21,15 +21,15 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/api" "github.com/docker/docker/api"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/cliconfig"
"github.com/docker/docker/daemon/events" "github.com/docker/docker/daemon/events"
"github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/daemon/execdriver/execdrivers" "github.com/docker/docker/daemon/execdriver/execdrivers"
"github.com/docker/docker/daemon/graphdriver" "github.com/docker/docker/daemon/graphdriver"
derr "github.com/docker/docker/errors" _ "github.com/docker/docker/daemon/graphdriver/vfs" // register vfs
// register vfs
_ "github.com/docker/docker/daemon/graphdriver/vfs"
"github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger"
"github.com/docker/docker/daemon/network" "github.com/docker/docker/daemon/network"
derr "github.com/docker/docker/errors"
"github.com/docker/docker/graph" "github.com/docker/docker/graph"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
@ -1272,3 +1272,16 @@ func configureVolumes(config *Config, rootUID, rootGID int) (*store.VolumeStore,
return s, nil return s, nil
} }
// AuthenticateToRegistry checks the validity of credentials in authConfig
func (daemon *Daemon) AuthenticateToRegistry(authConfig *cliconfig.AuthConfig) (string, error) {
return daemon.RegistryService.Auth(authConfig)
}
// SearchRegistryForImages queries the registry for images matching
// term. authConfig is used to login.
func (daemon *Daemon) SearchRegistryForImages(term string,
authConfig *cliconfig.AuthConfig,
headers map[string][]string) (*registry.SearchResults, error) {
return daemon.RegistryService.Search(term, authConfig, headers)
}