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

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

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

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

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

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

 )

@@ -90,6 +91,9 @@ func retryOnError(err error) error {

 			return xfer.DoNotRetry{Err: err}

 		}

 	case *url.Error:

+		if v.Err == auth.ErrNoBasicAuthCredentials {

+			return xfer.DoNotRetry{Err: v.Err}

+		}

 		return retryOnError(v.Err)

 	case *client.UnexpectedHTTPResponseError:

 		return xfer.DoNotRetry{Err: err}

@@ -526,3 +526,12 @@ func (s *DockerTrustSuite) TestTrustedPushWithReleasesDelegation(c *check.C) {

 	c.Assert(err, check.IsNil, check.Commentf("Unable to read targets/releases metadata"))

 	c.Assert(string(contents), checker.Contains, `"latest"`, check.Commentf(string(contents)))

 }

+

+func (s *DockerRegistryAuthSuite) TestPushNoCredentialsNoRetry(c *check.C) {

+	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)

+	dockerCmd(c, "tag", "busybox", repoName)

+	out, _, err := dockerCmdWithError("push", repoName)

+	c.Assert(err, check.NotNil, check.Commentf(out))

+	c.Assert(out, check.Not(checker.Contains), "Retrying")

+	c.Assert(out, checker.Contains, "no basic auth credentials")

+}