@@ -21,12 +21,6 @@ import (

 	imageapi "github.com/openshift/origin/pkg/image/api"

 )

-const (

-	publicV1DockerHubHost = "index.docker.io"

-	// TODO: is there a better URL?

-	publicV2DockerHubHost = "registry-1.docker.io"

-)

-

 type Image struct {

 	docker.Image

@@ -40,16 +34,17 @@ type Client interface {

 	Connect(registry string, allowInsecure bool) (Connection, error)

 }

-// Connection allows you to retrieve data from a Docker V1 registry.

+// Connection allows you to retrieve data from a Docker V1/V2 registry.

 type Connection interface {

-	// ImageTags will return a map of the tags for the image by namespace (if not

-	// specified, will be "library") and name.

+	// ImageTags will return a map of the tags for the image by namespace and name.

+	// If namespace is not specified, will default to "library" for Docker hub.

 	ImageTags(namespace, name string) (map[string]string, error)

-	// ImageByID will return the requested image by namespace (if not specified,

-	// will be "library"), name, and ID.

+	// ImageByID will return the requested image by namespace, name, and ID.

+	// If namespace is not specified, will default to "library" for Docker hub.

 	ImageByID(namespace, name, id string) (*Image, error)

-	// ImageByTag will return the requested image by namespace (if not specified,

-	// will be "library"), name, and tag (if not specified, "latest").

+	// ImageByTag will return the requested image by namespace, name, and tag

+	// (if not specified, "latest").

+	// If namespace is not specified, will default to "library" for Docker hub.

 	ImageByTag(namespace, name, tag string) (*Image, error)

 }

@@ -91,11 +86,11 @@ func (c *client) Connect(name string, allowInsecure bool) (Connection, error) {

 // segment and docker API version.

 func normalizeDockerHubHost(host string, v2 bool) string {

 	switch host {

-	case "docker.io", "www.docker.io", publicV1DockerHubHost, publicV2DockerHubHost:

+	case imageapi.DockerDefaultRegistry, "www." + imageapi.DockerDefaultRegistry, imageapi.DockerDefaultV1Registry, imageapi.DockerDefaultV2Registry:

 		if v2 {

-			return publicV2DockerHubHost

+			return imageapi.DockerDefaultV2Registry

 		}

-		return publicV1DockerHubHost

+		return imageapi.DockerDefaultV1Registry

 	}

 	return host

 }

@@ -105,7 +100,7 @@ func normalizeDockerHubHost(host string, v2 bool) string {

 func normalizeRegistryName(name string) (*url.URL, error) {

 	prefix := name

 	if len(prefix) == 0 {

-		prefix = publicV1DockerHubHost

+		prefix = imageapi.DockerDefaultV1Registry

 	}

 	hadPrefix := false

 	switch {

@@ -209,7 +204,7 @@ func newConnection(url url.URL, dialTimeout time.Duration, allowInsecure, enable

 // ImageTags returns the tags for the named Docker image repository.

 func (c *connection) ImageTags(namespace, name string) (map[string]string, error) {

-	if len(namespace) == 0 {

+	if len(namespace) == 0 && imageapi.IsRegistryDockerHub(c.url.Host) {

 		namespace = imageapi.DockerDefaultNamespace

 	}

 	if len(name) == 0 {

@@ -226,7 +221,7 @@ func (c *connection) ImageTags(namespace, name string) (map[string]string, error

 // ImageByID returns the specified image within the named Docker image repository

 func (c *connection) ImageByID(namespace, name, imageID string) (*Image, error) {

-	if len(namespace) == 0 {

+	if len(namespace) == 0 && imageapi.IsRegistryDockerHub(c.url.Host) {

 		namespace = imageapi.DockerDefaultNamespace

 	}

 	if len(name) == 0 {

@@ -243,7 +238,7 @@ func (c *connection) ImageByID(namespace, name, imageID string) (*Image, error)

 // ImageByTag returns the specified image within the named Docker image repository

 func (c *connection) ImageByTag(namespace, name, tag string) (*Image, error) {

-	if len(namespace) == 0 {

+	if len(namespace) == 0 && imageapi.IsRegistryDockerHub(c.url.Host) {

 		namespace = imageapi.DockerDefaultNamespace

 	}

 	if len(name) == 0 {

@@ -18,6 +18,10 @@ const (

 	DockerDefaultNamespace = "library"

 	// DockerDefaultRegistry is the value for the registry when none was provided.

 	DockerDefaultRegistry = "docker.io"

+	// DockerDefaultV1Registry is the host name of the default v1 registry

+	DockerDefaultV1Registry = "index." + DockerDefaultRegistry

+	// DockerDefaultV2Registry is the host name of the default v2 registry

+	DockerDefaultV2Registry = "registry-1." + DockerDefaultRegistry

 )

 // TODO remove (base, tag, id)

@@ -47,6 +51,17 @@ func isRegistryName(str string) bool {

 	return false

 }

+// IsRegistryDockerHub returns true if the given registry name belongs to

+// Docker hub.

+func IsRegistryDockerHub(registry string) bool {

+	switch registry {

+	case DockerDefaultRegistry, DockerDefaultV1Registry, DockerDefaultV2Registry:

+		return true

+	default:

+		return false

+	}

+}

+

 // ParseDockerImageReference parses a Docker pull spec string into a

 // DockerImageReference.

 func ParseDockerImageReference(spec string) (DockerImageReference, error) {

@@ -60,8 +75,9 @@ func ParseDockerImageReference(spec string) (DockerImageReference, error) {

 		if isRegistryName(repoParts[0]) {

 			// registry/name

 			ref.Registry = repoParts[0]

-			// TODO: default this in all cases where Namespace ends up as ""?

-			ref.Namespace = DockerDefaultNamespace

+			if IsRegistryDockerHub(ref.Registry) {

+				ref.Namespace = DockerDefaultNamespace

+			}

 			if len(repoParts[1]) == 0 {

 				return ref, fmt.Errorf("the docker pull spec %q must be two or three segments separated by slashes", spec)

 			}

@@ -117,12 +133,12 @@ func (r DockerImageReference) Equal(other DockerImageReference) bool {

 // DockerClientDefaults sets the default values used by the Docker client.

 func (r DockerImageReference) DockerClientDefaults() DockerImageReference {

-	if len(r.Namespace) == 0 {

-		r.Namespace = DockerDefaultNamespace

-	}

 	if len(r.Registry) == 0 {

 		r.Registry = DockerDefaultRegistry

 	}

+	if len(r.Namespace) == 0 && IsRegistryDockerHub(r.Registry) {

+		r.Namespace = DockerDefaultNamespace

+	}

 	if len(r.Tag) == 0 {

 		r.Tag = DefaultImageTag

 	}

@@ -150,8 +166,8 @@ func (r DockerImageReference) DaemonMinimal() DockerImageReference {

 		r.Namespace = ""

 	}

 	switch r.Registry {

-	case "index.docker.io", "docker.io":

-		r.Registry = "docker.io"

+	case DockerDefaultV1Registry, DockerDefaultV2Registry:

+		r.Registry = DockerDefaultRegistry

 	}

 	return r.Minimal()

 }

@@ -198,7 +214,7 @@ func (r DockerImageReference) Exact() string {

 // String converts a DockerImageReference to a Docker pull spec (which implies a default namespace

 // according to V1 Docker registry rules). Use Exact() if you want no defaulting.

 func (r DockerImageReference) String() string {

-	if len(r.Namespace) == 0 {

+	if len(r.Namespace) == 0 && IsRegistryDockerHub(r.Registry) {

 		r.Namespace = DockerDefaultNamespace

 	}

 	return r.Exact()

@@ -56,6 +56,12 @@ func TestParseDockerImageReference(t *testing.T) {

 			Name:      "baz",

 		},

 		{

+			From:      "bar/library/baz",

+			Registry:  "bar",

+			Namespace: "library",

+			Name:      "baz",

+		},

+		{

 			From:      "bar/foo/baz:tag",

 			Registry:  "bar",

 			Namespace: "foo",

@@ -76,12 +82,17 @@ func TestParseDockerImageReference(t *testing.T) {

 			Name:      "baz",

 		},

 		{

-			From:      "bar:5000/baz",

+			From:      "bar:5000/library/baz",

 			Registry:  "bar:5000",

-			Namespace: DockerDefaultNamespace,

+			Namespace: "library",

 			Name:      "baz",

 		},

 		{

+			From:     "bar:5000/baz",

+			Registry: "bar:5000",

+			Name:     "baz",

+		},

+		{

 			From:      "bar:5000/foo/baz:tag",

 			Registry:  "bar:5000",

 			Namespace: "foo",

@@ -96,14 +107,36 @@ func TestParseDockerImageReference(t *testing.T) {

 			ID:        "sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

 		},

 		{

-			From:      "myregistry.io/foo",

-			Registry:  "myregistry.io",

+			From:     "myregistry.io/foo",

+			Registry: "myregistry.io",

+			Name:     "foo",

+		},

+		{

+			From:     "localhost/bar",

+			Registry: "localhost",

+			Name:     "bar",

+		},

+		{

+			From:      "docker.io/library/myapp",

+			Registry:  "docker.io",

+			Namespace: "library",

+			Name:      "myapp",

+		},

+		{

+			From:      "docker.io/myapp",

+			Registry:  "docker.io",

 			Namespace: DockerDefaultNamespace,

-			Name:      "foo",

+			Name:      "myapp",

 		},

 		{

-			From:      "localhost/bar",

-			Registry:  "localhost",

+			From:      "docker.io/user/myapp",

+			Registry:  "docker.io",

+			Namespace: "user",

+			Name:      "myapp",

+		},

+		{

+			From:      "index.docker.io/bar",

+			Registry:  "index.docker.io",

 			Namespace: DockerDefaultNamespace,

 			Name:      "bar",

 		},

@@ -238,22 +271,22 @@ func TestDockerImageReferenceString(t *testing.T) {

 	}{

 		{

 			Name:     "foo",

-			Expected: "library/foo",

+			Expected: "foo",

 		},

 		{

 			Name:     "foo",

 			Tag:      "tag",

-			Expected: "library/foo:tag",

+			Expected: "foo:tag",

 		},

 		{

 			Name:     "foo",

 			ID:       "sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

-			Expected: "library/foo@sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

+			Expected: "foo@sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

 		},

 		{

 			Name:     "foo",

 			ID:       "3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

-			Expected: "library/foo:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

+			Expected: "foo:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

 		},

 		{

 			Namespace: "bar",

@@ -307,11 +340,36 @@ func TestDockerImageReferenceString(t *testing.T) {

 		},

 		{

 			Registry:  "bar:5000",

+			Namespace: "library",

+			Name:      "baz",

+			Tag:       "tag",

+			Expected:  "bar:5000/library/baz:tag",

+		},

+		{

+			Registry:  "bar:5000",

 			Namespace: "foo",

 			Name:      "baz",

 			ID:        "sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

 			Expected:  "bar:5000/foo/baz@sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

 		},

+		{

+			Registry:  "docker.io",

+			Namespace: "user",

+			Name:      "app",

+			Expected:  "docker.io/user/app",

+		},

+		{

+			Registry: "index.docker.io",

+			Name:     "foo",

+			Expected: "index.docker.io/library/foo",

+		},

+		{

+			Registry:  "index.docker.io",

+			Namespace: "library",

+			Name:      "bar",

+			ID:        "sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

+			Expected:  "index.docker.io/library/bar@sha256:3c87c572822935df60f0f5d3665bd376841a7fcfeb806b5f212de6a00e9a7b25",

+		},

 	}

 	for i, testCase := range testCases {

@@ -36,7 +36,7 @@ os::cmd::expect_success 'oc delete is/binary-test bc/binary-test'

 # Build from Dockerfile with output to DockerImage

 os::cmd::expect_success "oc new-build -D \$'FROM openshift/origin:v1.1' --to-docker"

-os::cmd::expect_success_and_text "oc get bc/origin --template '${template}'" '^DockerImage library/origin:latest$'

+os::cmd::expect_success_and_text "oc get bc/origin --template '${template}'" '^DockerImage origin:latest$'

 os::cmd::expect_success 'oc delete is/origin'

@@ -15,13 +15,13 @@ os::cmd::expect_success_and_text 'oc new-app library/php mysql -o yaml' '3306'

 os::cmd::expect_success_and_text 'oc new-app library/php mysql --dry-run' "Image \"mysql\" runs as the 'root' user which may not be permitted by your cluster administrator"

 os::cmd::expect_failure 'oc new-app unknownhubimage -o yaml'

 # verify we can generate a Docker image based component "mongodb" directly

-os::cmd::expect_success_and_text 'oc new-app mongo -o yaml' 'library/mongo'

+os::cmd::expect_success_and_text 'oc new-app mongo -o yaml' 'image:\s*mongo'

 # the local image repository takes precedence over the Docker Hub "mysql" image

 os::cmd::expect_success 'oc create -f examples/image-streams/image-streams-centos7.json'

 os::cmd::try_until_success 'oc get imagestreamtags mysql:latest'

 os::cmd::try_until_success 'oc get imagestreamtags mysql:5.5'

 os::cmd::try_until_success 'oc get imagestreamtags mysql:5.6'

-os::cmd::expect_success_and_not_text 'oc new-app mysql -o yaml' 'library/mysql'

+os::cmd::expect_success_and_not_text 'oc new-app mysql -o yaml' 'image:\s*mysql'

 os::cmd::expect_success_and_not_text 'oc new-app mysql --dry-run' "runs as the 'root' user which may not be permitted by your cluster administrator"

 # docker strategy with repo that has no dockerfile