Merge pull request #9705 from bparees/push_error

Merged by openshift-bot

Author: OpenShift Bot

pkg/build/builder/docker.go

@@ -118,7 +118,7 @@ func (d *DockerBuilder) Build() error {
 		}
 		glog.V(0).Infof("\nPushing image %s ...", pushTag)
 		if err := pushImage(d.dockerClient, pushTag, pushAuthConfig); err != nil {
-			return fmt.Errorf("Failed to push image: %v", err)
+			return reportPushFailure(err, authPresent, pushAuthConfig)
 		}
 		glog.V(0).Infof("Push successful")
 	}

pkg/build/builder/sti.go

@@ -267,19 +267,7 @@ func (s *S2IBuilder) Build() error {
 		}
 		glog.V(0).Infof("\nPushing image %s ...", pushTag)
 		if err := pushImage(s.dockerClient, pushTag, pushAuthConfig); err != nil {
-			// write extended error message to assist in problem resolution
-			msg := fmt.Sprintf("Failed to push image. Response from registry is: %v", err)
-			if authPresent {
-				glog.V(0).Infof("Registry server Address: %s", pushAuthConfig.ServerAddress)
-				glog.V(0).Infof("Registry server User Name: %s", pushAuthConfig.Username)
-				glog.V(0).Infof("Registry server Email: %s", pushAuthConfig.Email)
-				passwordPresent := "<<empty>>"
-				if len(pushAuthConfig.Password) > 0 {
-					passwordPresent = "<<non-empty>>"
-				}
-				glog.V(0).Infof("Registry server Password: %s", passwordPresent)
-			}
-			return errors.New(msg)
+			return reportPushFailure(err, authPresent, pushAuthConfig)
 		}
 		glog.V(0).Infof("Push successful")
 	}

pkg/build/builder/util.go

@@ -12,6 +12,8 @@ import (
 	"strconv"
 	"strings"
 
+	docker "github.com/fsouza/go-dockerclient"
+
 	s2iapi "github.com/openshift/source-to-image/pkg/api"
 )
 
@@ -175,3 +177,18 @@ func MergeEnv(oldEnv, newEnv []string) []string {
 	}
 	return result
 }
+
+func reportPushFailure(err error, authPresent bool, pushAuthConfig docker.AuthConfiguration) error {
+	// write extended error message to assist in problem resolution
+	if authPresent {
+		glog.V(0).Infof("Registry server Address: %s", pushAuthConfig.ServerAddress)
+		glog.V(0).Infof("Registry server User Name: %s", pushAuthConfig.Username)
+		glog.V(0).Infof("Registry server Email: %s", pushAuthConfig.Email)
+		passwordPresent := "<<empty>>"
+		if len(pushAuthConfig.Password) > 0 {
+			passwordPresent = "<<non-empty>>"
+		}
+		glog.V(0).Infof("Registry server Password: %s", passwordPresent)
+	}
+	return fmt.Errorf("Failed to push image: %v", err)
+}