3 files changed, 24 insertions, 4 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index c0e5706a5..6acfcc1c8 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -28,6 +28,10 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+var (
+	iidRegex = regexp.MustCompile(`^[0-9a-f]{12}`)
+)
+
 // Build creates an image using a containerfile reference
 func Build(ctx context.Context, containerFiles []string, options entities.BuildOptions) (*entities.BuildReport, error) {
 	params := url.Values{}
@@ -337,7 +341,6 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	}
 
 	dec := json.NewDecoder(body)
-	re := regexp.MustCompile(`[0-9a-f]{12}`)
 
 	var id string
 	var mErr error
@@ -366,7 +369,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 		switch {
 		case s.Stream != "":
 			stdout.Write([]byte(s.Stream))
-			if re.Match([]byte(s.Stream)) {
+			if iidRegex.Match([]byte(s.Stream)) {
 				id = strings.TrimSuffix(s.Stream, "\n")
 			}
 		case s.Error != "":
diff --git a/pkg/bindings/images/build_test.go b/pkg/bindings/images/build_test.go
new file mode 100644
index 000000000..e4035d5f8
--- /dev/null
+++ b/pkg/bindings/images/build_test.go
@@ -0,0 +1,17 @@
+package images
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBuildMatchIID(t *testing.T) {
+	assert.True(t, iidRegex.MatchString("a883dafc480d466ee04e0d6da986bd78eb1fdd2178d04693723da3a8f95d42f4"))
+	assert.True(t, iidRegex.MatchString("3da3a8f95d42"))
+	assert.False(t, iidRegex.MatchString("3da3"))
+}
+
+func TestBuildNotMatchStatusMessage(t *testing.T) {
+	assert.False(t, iidRegex.MatchString("Copying config a883dafc480d466ee04e0d6da986bd78eb1fdd2178d04693723da3a8f95d42f4"))
+}
diff --git a/pkg/bindings/images/pull.go b/pkg/bindings/images/pull.go
index f4da2d521..9780c3bff 100644
--- a/pkg/bindings/images/pull.go
+++ b/pkg/bindings/images/pull.go
@@ -3,7 +3,6 @@ package images
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -15,6 +14,7 @@ import (
 	"github.com/containers/podman/v3/pkg/bindings"
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/hashicorp/go-multierror"
+	"github.com/pkg/errors"
 )
 
 // Pull is the binding for libpod's v2 endpoints for pulling images.  Note that
@@ -91,7 +91,7 @@ func Pull(ctx context.Context, rawImage string, options *PullOptions) ([]string,
 			images = report.Images
 		case report.ID != "":
 		default:
-			return images, errors.New("failed to parse pull results stream, unexpected input")
+			return images, errors.Errorf("failed to parse pull results stream, unexpected input: %v", report)
 		}
 	}
 	return images, mErr