@@ -9,6 +9,7 @@ import (

 	"strings"

 	"github.com/docker/docker/api/client/lib"

+	"github.com/docker/docker/api/types"

 	Cli "github.com/docker/docker/cli"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/term"

@@ -8,7 +8,6 @@ import (

 	"github.com/docker/docker/api/client/lib"

 	"github.com/docker/docker/api/types"

 	Cli "github.com/docker/docker/cli"

-	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/pkg/jsonmessage"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/registry"

@@ -78,7 +77,7 @@ func (cli *DockerCli) CmdPull(args ...string) error {

 func (cli *DockerCli) imagePullPrivileged(authConfig types.AuthConfig, imageID, tag string, requestPrivilege lib.RequestPrivilegeFunc) error {

-	encodedAuth, err := cliconfig.EncodeAuthToBase64(authConfig)

+	encodedAuth, err := encodeAuthToBase64(authConfig)

 	if err != nil {

 		return err

 	}

@@ -9,7 +9,6 @@ import (

 	"github.com/docker/docker/api/client/lib"

 	"github.com/docker/docker/api/types"

 	Cli "github.com/docker/docker/cli"

-	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/pkg/jsonmessage"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/registry"

@@ -66,7 +65,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {

 }

 func (cli *DockerCli) imagePushPrivileged(authConfig types.AuthConfig, imageID, tag string, outputStream io.Writer, requestPrivilege lib.RequestPrivilegeFunc) error {

-	encodedAuth, err := cliconfig.EncodeAuthToBase64(authConfig)

+	encodedAuth, err := encodeAuthToBase64(authConfig)

 	if err != nil {

 		return err

 	}

@@ -9,7 +9,6 @@ import (

 	"github.com/docker/docker/api/types"

 	Cli "github.com/docker/docker/cli"

-	"github.com/docker/docker/cliconfig"

 	flag "github.com/docker/docker/pkg/mflag"

 	"github.com/docker/docker/pkg/stringutils"

 	"github.com/docker/docker/registry"

@@ -39,7 +38,7 @@ func (cli *DockerCli) CmdSearch(args ...string) error {

 	authConfig := registry.ResolveAuthConfig(cli.configFile.AuthConfigs, indexInfo)

 	requestPrivilege := cli.registryAuthenticationPrivilegedFunc(indexInfo, "search")

-	encodedAuth, err := cliconfig.EncodeAuthToBase64(authConfig)

+	encodedAuth, err := encodeAuthToBase64(authConfig)

 	if err != nil {

 		return err

 	}

@@ -24,6 +24,7 @@ import (

 	"github.com/docker/distribution/registry/client/transport"

 	"github.com/docker/docker/api/client/lib"

 	"github.com/docker/docker/api/types"

+	registrytypes "github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/pkg/ansiescape"

 	"github.com/docker/docker/pkg/ioutils"

@@ -81,7 +82,7 @@ func (cli *DockerCli) certificateDirectory(server string) (string, error) {

 	return filepath.Join(cliconfig.ConfigDir(), "tls", u.Host), nil

 }

-func trustServer(index *registry.IndexInfo) (string, error) {

+func trustServer(index *registrytypes.IndexInfo) (string, error) {

 	if s := os.Getenv("DOCKER_CONTENT_TRUST_SERVER"); s != "" {

 		urlObj, err := url.Parse(s)

 		if err != nil || urlObj.Scheme != "https" {

@@ -4,6 +4,7 @@ import (

 	"os"

 	"testing"

+	registrytypes "github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/registry"

 )

@@ -14,7 +15,7 @@ func unsetENV() {

 func TestENVTrustServer(t *testing.T) {

 	defer unsetENV()

-	indexInfo := &registry.IndexInfo{Name: "testserver"}

+	indexInfo := &registrytypes.IndexInfo{Name: "testserver"}

 	if err := os.Setenv("DOCKER_CONTENT_TRUST_SERVER", "https://notary-test.com:5000"); err != nil {

 		t.Fatal("Failed to set ENV variable")

 	}

@@ -27,7 +28,7 @@ func TestENVTrustServer(t *testing.T) {

 func TestHTTPENVTrustServer(t *testing.T) {

 	defer unsetENV()

-	indexInfo := &registry.IndexInfo{Name: "testserver"}

+	indexInfo := &registrytypes.IndexInfo{Name: "testserver"}

 	if err := os.Setenv("DOCKER_CONTENT_TRUST_SERVER", "http://notary-test.com:5000"); err != nil {

 		t.Fatal("Failed to set ENV variable")

 	}

@@ -38,7 +39,7 @@ func TestHTTPENVTrustServer(t *testing.T) {

 }

 func TestOfficialTrustServer(t *testing.T) {

-	indexInfo := &registry.IndexInfo{Name: "testserver", Official: true}

+	indexInfo := &registrytypes.IndexInfo{Name: "testserver", Official: true}

 	output, err := trustServer(indexInfo)

 	if err != nil || output != registry.NotaryServer {

 		t.Fatalf("Expected server to be %s, got %s", registry.NotaryServer, output)

@@ -46,7 +47,7 @@ func TestOfficialTrustServer(t *testing.T) {

 }

 func TestNonOfficialTrustServer(t *testing.T) {

-	indexInfo := &registry.IndexInfo{Name: "testserver", Official: false}

+	indexInfo := &registrytypes.IndexInfo{Name: "testserver", Official: false}

 	output, err := trustServer(indexInfo)

 	expectedStr := "https://" + indexInfo.Name

 	if err != nil || output != expectedStr {

@@ -12,13 +12,14 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api/client/lib"

 	"github.com/docker/docker/api/types"

+	registrytypes "github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/docker/docker/pkg/term"

 	"github.com/docker/docker/registry"

 )

 // encodeAuthToBase64 serializes the auth configuration as JSON base64 payload

-func encodeAuthToBase64(authConfig AuthConfig) (string, error) {

+func encodeAuthToBase64(authConfig types.AuthConfig) (string, error) {

 	buf, err := json.Marshal(authConfig)

 	if err != nil {

 		return "", err

@@ -26,15 +27,15 @@ func encodeAuthToBase64(authConfig AuthConfig) (string, error) {

 	return base64.URLEncoding.EncodeToString(buf), nil

 }

-func (cli *DockerCli) encodeRegistryAuth(index *registry.IndexInfo) (string, error) {

+func (cli *DockerCli) encodeRegistryAuth(index *registrytypes.IndexInfo) (string, error) {

 	authConfig := registry.ResolveAuthConfig(cli.configFile.AuthConfigs, index)

-	return cliconfig.EncodeAuthToBase64(authConfig)

+	return encodeAuthToBase64(authConfig)

 }

-func (cli *DockerCli) registryAuthenticationPrivilegedFunc(index *registry.IndexInfo, cmdName string) lib.RequestPrivilegeFunc {

+func (cli *DockerCli) registryAuthenticationPrivilegedFunc(index *registrytypes.IndexInfo, cmdName string) lib.RequestPrivilegeFunc {

 	return func() (string, error) {

 		fmt.Fprintf(cli.out, "\nPlease login prior to %s:\n", cmdName)

-		if err := cli.CmdLogin(index.GetAuthConfigKey()); err != nil {

+		if err := cli.CmdLogin(registry.GetAuthConfigKey(index)); err != nil {

 			return "", err

 		}

 		return cli.encodeRegistryAuth(index)

@@ -134,7 +134,7 @@ type ImageBuildOptions struct {

 	Dockerfile     string

 	Ulimits        []*ulimit.Ulimit

 	BuildArgs      []string

-	AuthConfigs    map[string]types.AuthConfig

+	AuthConfigs    map[string]AuthConfig

 	Context        io.Reader

 }

new file mode 100644

@@ -0,0 +1,75 @@

+package registry

+

+import (

+	"encoding/json"

+	"net"

+)

+

+// ServiceConfig stores daemon registry services configuration.

+type ServiceConfig struct {

+	InsecureRegistryCIDRs []*NetIPNet           `json:"InsecureRegistryCIDRs"`

+	IndexConfigs          map[string]*IndexInfo `json:"IndexConfigs"`

+	Mirrors               []string

+}

+

+// NetIPNet is the net.IPNet type, which can be marshalled and

+// unmarshalled to JSON

+type NetIPNet net.IPNet

+

+// MarshalJSON returns the JSON representation of the IPNet

+func (ipnet *NetIPNet) MarshalJSON() ([]byte, error) {

+	return json.Marshal((*net.IPNet)(ipnet).String())

+}

+

+// UnmarshalJSON sets the IPNet from a byte array of JSON

+func (ipnet *NetIPNet) UnmarshalJSON(b []byte) (err error) {

+	var ipnetStr string

+	if err = json.Unmarshal(b, &ipnetStr); err == nil {

+		var cidr *net.IPNet

+		if _, cidr, err = net.ParseCIDR(ipnetStr); err == nil {

+			*ipnet = NetIPNet(*cidr)

+		}

+	}

+	return

+}

+

+// IndexInfo contains information about a registry

+//

+// RepositoryInfo Examples:

+// {

+//   "Index" : {

+//     "Name" : "docker.io",

+//     "Mirrors" : ["https://registry-2.docker.io/v1/", "https://registry-3.docker.io/v1/"],

+//     "Secure" : true,

+//     "Official" : true,

+//   },

+//   "RemoteName" : "library/debian",

+//   "LocalName" : "debian",

+//   "CanonicalName" : "docker.io/debian"

+//   "Official" : true,

+// }

+//

+// {

+//   "Index" : {

+//     "Name" : "127.0.0.1:5000",

+//     "Mirrors" : [],

+//     "Secure" : false,

+//     "Official" : false,

+//   },

+//   "RemoteName" : "user/repo",

+//   "LocalName" : "127.0.0.1:5000/user/repo",

+//   "CanonicalName" : "127.0.0.1:5000/user/repo",

+//   "Official" : false,

+// }

+type IndexInfo struct {

+	// Name is the name of the registry, such as "docker.io"

+	Name string

+	// Mirrors is a list of mirrors, expressed as URIs

+	Mirrors []string

+	// Secure is set to false if the registry is part of the list of

+	// insecure registries. Insecure registries accept HTTP and/or accept

+	// HTTPS with certificates from unknown CAs.

+	Secure bool

+	// Official indicates whether this is an official registry

+	Official bool

+}

@@ -5,9 +5,9 @@ import (

 	"time"

 	"github.com/docker/docker/api/types/network"

+	"github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/pkg/nat"

 	"github.com/docker/docker/pkg/version"

-	"github.com/docker/docker/registry"

 	"github.com/docker/docker/runconfig"

 )

@@ -45,15 +45,6 @@ func SetConfigDir(dir string) {

 	configDir = dir

 }

-// EncodeAuthToBase64 serializes the auth configuration as JSON base64 payload

-func EncodeAuthToBase64(authConfig AuthConfig) (string, error) {

-	buf, err := json.Marshal(authConfig)

-	if err != nil {

-		return "", err

-	}

-	return base64.URLEncoding.EncodeToString(buf), nil

-}

-

 // ConfigFile ~/.docker/config.json file info

 type ConfigFile struct {

 	AuthConfigs map[string]types.AuthConfig `json:"auths"`

@@ -13,7 +13,6 @@ import (

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/builder"

-	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/container"

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/image"

@@ -7,6 +7,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/distribution/reference"

+	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/daemon/events"

 	"github.com/docker/docker/distribution/metadata"

 	"github.com/docker/docker/distribution/xfer"

@@ -9,6 +9,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/distribution/digest"

 	"github.com/docker/distribution/reference"

+	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/daemon/events"

 	"github.com/docker/docker/distribution/metadata"

 	"github.com/docker/docker/distribution/xfer"

@@ -17,6 +17,7 @@ import (

 	"github.com/docker/distribution/registry/client"

 	"github.com/docker/distribution/registry/client/auth"

 	"github.com/docker/distribution/registry/client/transport"

+	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/distribution/xfer"

 	"github.com/docker/docker/registry"

 	"golang.org/x/net/context"

@@ -10,6 +10,8 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/distribution/reference"

 	"github.com/docker/distribution/registry/client/auth"

+	"github.com/docker/docker/api/types"

+	registrytypes "github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/registry"

 	"github.com/docker/docker/utils"

 	"golang.org/x/net/context"

@@ -56,7 +58,7 @@ func TestTokenPassThru(t *testing.T) {

 	}

 	n, _ := reference.ParseNamed("testremotename")

 	repoInfo := &registry.RepositoryInfo{

-		Index: &registry.IndexInfo{

+		Index: &registrytypes.IndexInfo{

 			Name:     "testrepo",

 			Mirrors:  nil,

 			Secure:   false,

@@ -8,7 +8,8 @@ import (

 	"strings"

 	"github.com/Sirupsen/logrus"

-	"github.com/docker/docker/cliconfig"

+	"github.com/docker/docker/api/types"

+	registrytypes "github.com/docker/docker/api/types/registry"

 )

 // Login tries to register/login to the registry server.

@@ -221,8 +222,8 @@ func tryV2TokenAuthLogin(authConfig *types.AuthConfig, params map[string]string,

 }

 // ResolveAuthConfig matches an auth configuration to a server address or a URL

-func ResolveAuthConfig(authConfigs map[string]types.AuthConfig, index *IndexInfo) types.AuthConfig {

-	configKey := index.GetAuthConfigKey()

+func ResolveAuthConfig(authConfigs map[string]types.AuthConfig, index *registrytypes.IndexInfo) types.AuthConfig {

+	configKey := GetAuthConfigKey(index)

 	// First try the happy case

 	if c, found := authConfigs[configKey]; found || index.Official {

 		return c

@@ -3,6 +3,8 @@ package registry

 import (

 	"testing"

+	"github.com/docker/docker/api/types"

+	registrytypes "github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/cliconfig"

 )

@@ -26,8 +28,8 @@ func TestEncodeAuth(t *testing.T) {

 	}

 }

-func buildAuthConfigs() map[string]cliconfig.AuthConfig {

-	authConfigs := map[string]cliconfig.AuthConfig{}

+func buildAuthConfigs() map[string]types.AuthConfig {

+	authConfigs := map[string]types.AuthConfig{}

 	for _, registry := range []string{"testIndex", IndexServer} {

 		authConfigs[registry] = types.AuthConfig{

@@ -61,10 +63,10 @@ func TestResolveAuthConfigIndexServer(t *testing.T) {

 	authConfigs := buildAuthConfigs()

 	indexConfig := authConfigs[IndexServer]

-	officialIndex := &IndexInfo{

+	officialIndex := &registrytypes.IndexInfo{

 		Official: true,

 	}

-	privateIndex := &IndexInfo{

+	privateIndex := &registrytypes.IndexInfo{

 		Official: false,

 	}

@@ -127,7 +129,7 @@ func TestResolveAuthConfigFullURL(t *testing.T) {

 		if !ok || configured.Email == "" {

 			t.Fail()

 		}

-		index := &IndexInfo{

+		index := &registrytypes.IndexInfo{

 			Name: configKey,

 		}

 		for _, registry := range registries {

@@ -1,7 +1,6 @@

 package registry

 import (

-	"encoding/json"

 	"errors"

 	"fmt"

 	"net"

@@ -9,6 +8,7 @@ import (

 	"strings"

 	"github.com/docker/distribution/reference"

+	registrytypes "github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/image/v1"

 	"github.com/docker/docker/opts"

 	flag "github.com/docker/docker/pkg/mflag"

@@ -60,32 +60,8 @@ func (options *Options) InstallFlags(cmd *flag.FlagSet, usageFn func(string) str

 	cmd.BoolVar(&V2Only, []string{"-disable-legacy-registry"}, false, "Do not contact legacy registries")

 }

-type netIPNet net.IPNet

-

-func (ipnet *netIPNet) MarshalJSON() ([]byte, error) {

-	return json.Marshal((*net.IPNet)(ipnet).String())

-}

-

-func (ipnet *netIPNet) UnmarshalJSON(b []byte) (err error) {

-	var ipnetStr string

-	if err = json.Unmarshal(b, &ipnetStr); err == nil {

-		var cidr *net.IPNet

-		if _, cidr, err = net.ParseCIDR(ipnetStr); err == nil {

-			*ipnet = netIPNet(*cidr)

-		}

-	}

-	return

-}

-

-// ServiceConfig stores daemon registry services configuration.

-type ServiceConfig struct {

-	InsecureRegistryCIDRs []*netIPNet           `json:"InsecureRegistryCIDRs"`

-	IndexConfigs          map[string]*IndexInfo `json:"IndexConfigs"`

-	Mirrors               []string

-}

-

 // NewServiceConfig returns a new instance of ServiceConfig

-func NewServiceConfig(options *Options) *ServiceConfig {

+func NewServiceConfig(options *Options) *registrytypes.ServiceConfig {

 	if options == nil {

 		options = &Options{

 			Mirrors:            opts.NewListOpts(nil),

@@ -100,9 +76,9 @@ func NewServiceConfig(options *Options) *ServiceConfig {

 	// daemon flags on boot2docker?

 	options.InsecureRegistries.Set("127.0.0.0/8")

-	config := &ServiceConfig{

-		InsecureRegistryCIDRs: make([]*netIPNet, 0),

-		IndexConfigs:          make(map[string]*IndexInfo, 0),

+	config := &registrytypes.ServiceConfig{

+		InsecureRegistryCIDRs: make([]*registrytypes.NetIPNet, 0),

+		IndexConfigs:          make(map[string]*registrytypes.IndexInfo, 0),

 		// Hack: Bypass setting the mirrors to IndexConfigs since they are going away

 		// and Mirrors are only for the official registry anyways.

 		Mirrors: options.Mirrors.GetAll(),

@@ -113,10 +89,10 @@ func NewServiceConfig(options *Options) *ServiceConfig {

 		_, ipnet, err := net.ParseCIDR(r)

 		if err == nil {

 			// Valid CIDR.

-			config.InsecureRegistryCIDRs = append(config.InsecureRegistryCIDRs, (*netIPNet)(ipnet))

+			config.InsecureRegistryCIDRs = append(config.InsecureRegistryCIDRs, (*registrytypes.NetIPNet)(ipnet))

 		} else {

 			// Assume `host:port` if not CIDR.

-			config.IndexConfigs[r] = &IndexInfo{

+			config.IndexConfigs[r] = &registrytypes.IndexInfo{

 				Name:     r,

 				Mirrors:  make([]string, 0),

 				Secure:   false,

@@ -126,7 +102,7 @@ func NewServiceConfig(options *Options) *ServiceConfig {

 	}

 	// Configure public registry.

-	config.IndexConfigs[IndexName] = &IndexInfo{

+	config.IndexConfigs[IndexName] = &registrytypes.IndexInfo{

 		Name:     IndexName,

 		Mirrors:  config.Mirrors,

 		Secure:   true,

@@ -147,9 +123,9 @@ func NewServiceConfig(options *Options) *ServiceConfig {

 // or an IP address. If it is a domain name, then it will be resolved in order to check if the IP is contained

 // in a subnet. If the resolving is not successful, isSecureIndex will only try to match hostname to any element

 // of insecureRegistries.

-func (config *ServiceConfig) isSecureIndex(indexName string) bool {

+func isSecureIndex(config *registrytypes.ServiceConfig, indexName string) bool {

 	// Check for configured index, first.  This is needed in case isSecureIndex

-	// is called from anything besides NewIndexInfo, in order to honor per-index configurations.

+	// is called from anything besides newIndexInfo, in order to honor per-index configurations.

 	if index, ok := config.IndexConfigs[indexName]; ok {

 		return index.Secure

 	}

@@ -258,8 +234,8 @@ func loadRepositoryName(reposName reference.Named) (string, reference.Named, err

 	return indexName, remoteName, nil

 }

-// NewIndexInfo returns IndexInfo configuration from indexName

-func (config *ServiceConfig) NewIndexInfo(indexName string) (*IndexInfo, error) {

+// newIndexInfo returns IndexInfo configuration from indexName

+func newIndexInfo(config *registrytypes.ServiceConfig, indexName string) (*registrytypes.IndexInfo, error) {

 	var err error

 	indexName, err = ValidateIndexName(indexName)

 	if err != nil {

@@ -272,18 +248,18 @@ func (config *ServiceConfig) NewIndexInfo(indexName string) (*IndexInfo, error)

 	}

 	// Construct a non-configured index info.

-	index := &IndexInfo{

+	index := &registrytypes.IndexInfo{

 		Name:     indexName,

 		Mirrors:  make([]string, 0),

 		Official: false,

 	}

-	index.Secure = config.isSecureIndex(indexName)

+	index.Secure = isSecureIndex(config, indexName)

 	return index, nil

 }

 // GetAuthConfigKey special-cases using the full index address of the official

 // index as the AuthConfig key, and uses the (host)name[:port] for private indexes.

-func (index *IndexInfo) GetAuthConfigKey() string {

+func GetAuthConfigKey(index *registrytypes.IndexInfo) string {

 	if index.Official {

 		return IndexServer

 	}

@@ -306,8 +282,8 @@ func splitReposName(reposName reference.Named) (indexName string, remoteName ref

 	return

 }

-// NewRepositoryInfo validates and breaks down a repository name into a RepositoryInfo

-func (config *ServiceConfig) NewRepositoryInfo(reposName reference.Named) (*RepositoryInfo, error) {

+// newRepositoryInfo validates and breaks down a repository name into a RepositoryInfo

+func newRepositoryInfo(config *registrytypes.ServiceConfig, reposName reference.Named) (*RepositoryInfo, error) {

 	if err := validateNoSchema(reposName.Name()); err != nil {

 		return nil, err

 	}

@@ -323,7 +299,7 @@ func (config *ServiceConfig) NewRepositoryInfo(reposName reference.Named) (*Repo

 		return nil, err

 	}

-	repoInfo.Index, err = config.NewIndexInfo(indexName)

+	repoInfo.Index, err = newIndexInfo(config, indexName)

 	if err != nil {

 		return nil, err

 	}

@@ -364,14 +340,14 @@ func (config *ServiceConfig) NewRepositoryInfo(reposName reference.Named) (*Repo

 // ParseRepositoryInfo performs the breakdown of a repository name into a RepositoryInfo, but

 // lacks registry configuration.

 func ParseRepositoryInfo(reposName reference.Named) (*RepositoryInfo, error) {

-	return emptyServiceConfig.NewRepositoryInfo(reposName)

+	return newRepositoryInfo(emptyServiceConfig, reposName)

 }

 // ParseSearchIndexInfo will use repository name to get back an indexInfo.

-func ParseSearchIndexInfo(reposName string) (*IndexInfo, error) {

+func ParseSearchIndexInfo(reposName string) (*registrytypes.IndexInfo, error) {

 	indexName, _ := splitReposSearchTerm(reposName)

-	indexInfo, err := emptyServiceConfig.NewIndexInfo(indexName)

+	indexInfo, err := newIndexInfo(emptyServiceConfig, indexName)

 	if err != nil {

 		return nil, err

 	}

@@ -13,6 +13,7 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/distribution/registry/api/v2"

 	"github.com/docker/distribution/registry/client/transport"

+	registrytypes "github.com/docker/docker/api/types/registry"

 )

 // for mocking in unit tests

@@ -44,12 +45,12 @@ func scanForAPIVersion(address string) (string, APIVersion) {

 // NewEndpoint parses the given address to return a registry endpoint.  v can be used to

 // specify a specific endpoint version

-func NewEndpoint(index *IndexInfo, metaHeaders http.Header, v APIVersion) (*Endpoint, error) {

+func NewEndpoint(index *registrytypes.IndexInfo, metaHeaders http.Header, v APIVersion) (*Endpoint, error) {

 	tlsConfig, err := newTLSConfig(index.Name, index.Secure)

 	if err != nil {

 		return nil, err

 	}

-	endpoint, err := newEndpoint(index.GetAuthConfigKey(), tlsConfig, metaHeaders)

+	endpoint, err := newEndpoint(GetAuthConfigKey(index), tlsConfig, metaHeaders)

 	if err != nil {

 		return nil, err

 	}

@@ -16,6 +16,7 @@ import (

 	"time"

 	"github.com/docker/distribution/reference"

+	registrytypes "github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/opts"

 	"github.com/gorilla/mux"

@@ -150,22 +151,22 @@ func makeHTTPSURL(req string) string {

 	return testHTTPSServer.URL + req

 }

-func makeIndex(req string) *IndexInfo {

-	index := &IndexInfo{

+func makeIndex(req string) *registrytypes.IndexInfo {

+	index := &registrytypes.IndexInfo{

 		Name: makeURL(req),

 	}

 	return index

 }

-func makeHTTPSIndex(req string) *IndexInfo {

-	index := &IndexInfo{

+func makeHTTPSIndex(req string) *registrytypes.IndexInfo {

+	index := &registrytypes.IndexInfo{

 		Name: makeHTTPSURL(req),

 	}

 	return index

 }

-func makePublicIndex() *IndexInfo {

-	index := &IndexInfo{

+func makePublicIndex() *registrytypes.IndexInfo {

+	index := &registrytypes.IndexInfo{

 		Name:     IndexServer,

 		Secure:   true,

 		Official: true,

@@ -173,7 +174,7 @@ func makePublicIndex() *IndexInfo {

 	return index

 }

-func makeServiceConfig(mirrors []string, insecureRegistries []string) *ServiceConfig {

+func makeServiceConfig(mirrors []string, insecureRegistries []string) *registrytypes.ServiceConfig {

 	options := &Options{

 		Mirrors:            opts.NewListOpts(nil),

 		InsecureRegistries: opts.NewListOpts(nil),

@@ -10,6 +10,8 @@ import (

 	"github.com/docker/distribution/reference"

 	"github.com/docker/distribution/registry/client/transport"

+	"github.com/docker/docker/api/types"

+	registrytypes "github.com/docker/docker/api/types/registry"

 )

 var (

@@ -49,7 +51,7 @@ func spawnTestRegistrySession(t *testing.T) *Session {

 }

 func TestPingRegistryEndpoint(t *testing.T) {

-	testPing := func(index *IndexInfo, expectedStandalone bool, assertMessage string) {

+	testPing := func(index *registrytypes.IndexInfo, expectedStandalone bool, assertMessage string) {

 		ep, err := NewEndpoint(index, nil, APIVersionUnknown)

 		if err != nil {

 			t.Fatal(err)

@@ -69,7 +71,7 @@ func TestPingRegistryEndpoint(t *testing.T) {

 func TestEndpoint(t *testing.T) {

 	// Simple wrapper to fail test if err != nil

-	expandEndpoint := func(index *IndexInfo) *Endpoint {

+	expandEndpoint := func(index *registrytypes.IndexInfo) *Endpoint {

 		endpoint, err := NewEndpoint(index, nil, APIVersionUnknown)

 		if err != nil {

 			t.Fatal(err)

@@ -77,7 +79,7 @@ func TestEndpoint(t *testing.T) {

 		return endpoint

 	}

-	assertInsecureIndex := func(index *IndexInfo) {

+	assertInsecureIndex := func(index *registrytypes.IndexInfo) {

 		index.Secure = true

 		_, err := NewEndpoint(index, nil, APIVersionUnknown)

 		assertNotEqual(t, err, nil, index.Name+": Expected error for insecure index")

@@ -85,7 +87,7 @@ func TestEndpoint(t *testing.T) {

 		index.Secure = false

 	}

-	assertSecureIndex := func(index *IndexInfo) {

+	assertSecureIndex := func(index *registrytypes.IndexInfo) {

 		index.Secure = true

 		_, err := NewEndpoint(index, nil, APIVersionUnknown)

 		assertNotEqual(t, err, nil, index.Name+": Expected cert error for secure index")

@@ -93,7 +95,7 @@ func TestEndpoint(t *testing.T) {

 		index.Secure = false

 	}

-	index := &IndexInfo{}

+	index := &registrytypes.IndexInfo{}

 	index.Name = makeURL("/v1/")

 	endpoint := expandEndpoint(index)

 	assertEqual(t, endpoint.String(), index.Name, "Expected endpoint to be "+index.Name)

@@ -363,7 +365,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 	expectedRepoInfos := map[string]RepositoryInfo{

 		"fooo/bar": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -373,7 +375,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"library/ubuntu": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -383,7 +385,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      true,

 		},

 		"nonlibrary/ubuntu": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -393,7 +395,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"ubuntu": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -403,7 +405,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      true,

 		},

 		"other/library": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -413,7 +415,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"127.0.0.1:8000/private/moonbase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "127.0.0.1:8000",

 				Official: false,

 			},

@@ -423,7 +425,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"127.0.0.1:8000/privatebase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "127.0.0.1:8000",

 				Official: false,

 			},

@@ -433,7 +435,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"localhost:8000/private/moonbase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "localhost:8000",

 				Official: false,

 			},

@@ -443,7 +445,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"localhost:8000/privatebase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "localhost:8000",

 				Official: false,

 			},

@@ -453,7 +455,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"example.com/private/moonbase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "example.com",

 				Official: false,

 			},

@@ -463,7 +465,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"example.com/privatebase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "example.com",

 				Official: false,

 			},

@@ -473,7 +475,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"example.com:8000/private/moonbase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "example.com:8000",

 				Official: false,

 			},

@@ -483,7 +485,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"example.com:8000/privatebase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "example.com:8000",

 				Official: false,

 			},

@@ -493,7 +495,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"localhost/private/moonbase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "localhost",

 				Official: false,

 			},

@@ -503,7 +505,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"localhost/privatebase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     "localhost",

 				Official: false,

 			},

@@ -513,7 +515,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		IndexName + "/public/moonbase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -523,7 +525,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"index." + IndexName + "/public/moonbase": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -533,7 +535,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      false,

 		},

 		"ubuntu-12.04-base": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -543,7 +545,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      true,

 		},

 		IndexName + "/ubuntu-12.04-base": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -553,7 +555,7 @@ func TestParseRepositoryInfo(t *testing.T) {

 			Official:      true,

 		},

 		"index." + IndexName + "/ubuntu-12.04-base": {

-			Index: &IndexInfo{

+			Index: &registrytypes.IndexInfo{

 				Name:     IndexName,

 				Official: true,

 			},

@@ -585,9 +587,9 @@ func TestParseRepositoryInfo(t *testing.T) {

 }

 func TestNewIndexInfo(t *testing.T) {

-	testIndexInfo := func(config *ServiceConfig, expectedIndexInfos map[string]*IndexInfo) {

+	testIndexInfo := func(config *registrytypes.ServiceConfig, expectedIndexInfos map[string]*registrytypes.IndexInfo) {

 		for indexName, expectedIndexInfo := range expectedIndexInfos {

-			index, err := config.NewIndexInfo(indexName)

+			index, err := newIndexInfo(config, indexName)

 			if err != nil {

 				t.Fatal(err)

 			} else {

@@ -601,7 +603,7 @@ func TestNewIndexInfo(t *testing.T) {

 	config := NewServiceConfig(nil)

 	noMirrors := []string{}

-	expectedIndexInfos := map[string]*IndexInfo{

+	expectedIndexInfos := map[string]*registrytypes.IndexInfo{

 		IndexName: {

 			Name:     IndexName,

 			Official: true,