Don't try to mount at all if we hit an error

pkg/v1/remote/write.go

@@ -210,7 +210,7 @@ func (w *writer) initiateUpload(ctx context.Context, from, mount, origin string)
 	req.Header.Set("Content-Type", "application/json")
 	resp, err := w.client.Do(req.WithContext(ctx))
 	if err != nil {
-		if origin != "" && origin != w.repo.RegistryStr() {
+		if from != "" {
 			// https://github.com/google/go-containerregistry/issues/1679
 			logs.Warn.Printf("retrying without mount: %v", err)
 			return w.initiateUpload(ctx, "", "", "")
@@ -220,7 +220,7 @@ func (w *writer) initiateUpload(ctx context.Context, from, mount, origin string)
 	defer resp.Body.Close()
 
 	if err := transport.CheckError(resp, http.StatusCreated, http.StatusAccepted); err != nil {
-		if origin != "" && origin != w.repo.RegistryStr() {
+		if from != "" {
 			// https://github.com/google/go-containerregistry/issues/1404
 			logs.Warn.Printf("retrying without mount: %v", err)
 			return w.initiateUpload(ctx, "", "", "")
@@ -365,6 +365,7 @@ func (w *writer) uploadOne(ctx context.Context, l v1.Layer) error {
 			origin = ml.Reference.Context().RegistryStr()
 
 			// This keeps breaking with DockerHub.
+			// https://github.com/google/go-containerregistry/issues/1741
 			if w.repo.RegistryStr() == name.DefaultRegistry && origin != w.repo.RegistryStr() {
 				from = ""
 				origin = ""