Merge pull request #486 from bparees/commit_error

Merged by openshift-bot
openshift · May 4, 2016 · c99ef8b · c99ef8b
2 parents c594bf4 + fafcd34
commit c99ef8b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pkg/build/strategies/sti/sti.go b/pkg/build/strategies/sti/sti.go
@@ -326,7 +326,7 @@ func (builder *STI) PostExecute(containerID, location string) error {
 
 	imageID, err := builder.docker.CommitContainer(opts)
 	if err != nil {
-		return errors.NewBuildError(builder.config.Tag, err)
+		return errors.NewCommitError(builder.config.Tag, err)
 	}
 
 	builder.result.Success = true

diff --git a/pkg/errors/errors.go b/pkg/errors/errors.go
@@ -117,6 +117,17 @@ func NewBuildError(name string, err error) error {
 	}
 }
 
+// NewCommitError returns a new error which indicates there was a problem
+// committing the image
+func NewCommitError(name string, err error) error {
+	return Error{
+		Message:    fmt.Sprintf("building %s failed when committing the image due to error: %v", name, err),
+		Details:    err,
+		ErrorCode:  BuildError,
+		Suggestion: "check the build output for errors",
+	}
+}
+
 // NewTarTimeoutError returns a new error which indicates there was a problem
 // when sending or receiving tar stream
 func NewTarTimeoutError() error {