hide docker ID hint for non docker registry login

runcom · runcom · commit 0073a78a27eb · 2017-02-15T12:26:22.000+01:00
Signed-off-by: Antonio Murdaca &lt;runcom@redhat.com&gt;
diff --git a/cli/command/registry.go b/cli/command/registry.go
@@ -128,7 +128,7 @@ func ConfigureAuth(cli *DockerCli, flUser, flPassword, serverAddress string, isD
 	authconfig.Username = strings.TrimSpace(authconfig.Username)
 
 	if flUser = strings.TrimSpace(flUser); flUser == "" {
-		if isDefaultRegistry {
+		if serverAddress == "https://index.docker.io/v1/" {
 			// if this is a default registry (docker hub), then display the following message.
 			fmt.Fprintln(cli.Out(), "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.")
 		}

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func ConfigureAuth(cli *DockerCli, flUser, flPassword, serverAddress string, isD`
`128`	`128`	`authconfig.Username = strings.TrimSpace(authconfig.Username)`
`129`	`129`
`130`	`130`	`if flUser = strings.TrimSpace(flUser); flUser == "" {`
`131`		`- if isDefaultRegistry {`
	`131`	`+ if serverAddress == "https://index.docker.io/v1/" {`
`132`	`132`	`// if this is a default registry (docker hub), then display the following message.`
`133`	`133`	`fmt.Fprintln(cli.Out(), "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.")`
`134`	`134`	`}`