From bac83c76084d2b8667b023b4506f385db993deb9 Mon Sep 17 00:00:00 2001
From: Jake Moshenko <jake@devtable.com>
Date: Thu, 20 Feb 2014 17:57:58 -0500
Subject: [PATCH] Fix registry auth by storing the string passed on the command
 line, and allowing for credential selection by normalizing on hostname. Also,
 remove remote ping calls from CmdPush and CmdPull.

Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
---
 docs/registry.go      | 9 +++------
 docs/registry_test.go | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/docs/registry.go b/docs/registry.go
index df9430230..37e107fad 100644
--- a/docs/registry.go
+++ b/docs/registry.go
@@ -91,7 +91,7 @@ func validateRepositoryName(repositoryName string) error {
 	return nil
 }
 
-// Resolves a repository name to a endpoint + name
+// Resolves a repository name to a hostname + name
 func ResolveRepositoryName(reposName string) (string, string, error) {
 	if strings.Contains(reposName, "://") {
 		// It cannot contain a scheme!
@@ -117,11 +117,8 @@ func ResolveRepositoryName(reposName string) (string, string, error) {
 	if err := validateRepositoryName(reposName); err != nil {
 		return "", "", err
 	}
-	endpoint, err := ExpandAndVerifyRegistryUrl(hostname)
-	if err != nil {
-		return "", "", err
-	}
-	return endpoint, reposName, err
+
+	return hostname, reposName, nil
 }
 
 // this method expands the registry name as used in the prefix of a repo
diff --git a/docs/registry_test.go b/docs/registry_test.go
index 16bc431e5..5e398f993 100644
--- a/docs/registry_test.go
+++ b/docs/registry_test.go
@@ -145,7 +145,7 @@ func TestResolveRepositoryName(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	assertEqual(t, ep, "http://"+u+"/v1/", "Expected endpoint to be "+u)
+	assertEqual(t, ep, u, "Expected endpoint to be "+u)
 	assertEqual(t, repo, "private/moonbase", "Expected endpoint to be private/moonbase")
 }