fix: distinguish docker build errors from streaming errors (#6910)

Co-authored-by: Tejal Desai <[email protected]>
GoogleContainerTools · Dec 10, 2021 · 5933db1 · 5933db1
1 parent 0d05992
commit 5933db1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/integration/build_dependencies_test.go b/integration/build_dependencies_test.go
@@ -60,12 +60,12 @@ func TestBuildDependenciesOrder(t *testing.T) {
 		{
 			description: "build failure with concurrency=1",
 			args:        []string{"-p", "failed-dependency"},
-			failure:     `unable to stream build output: The command '/bin/sh -c [ "${FAIL}" == "0" ] || false' returned a non-zero code: 1`,
+			failure:     `docker build failure: The command '/bin/sh -c [ "${FAIL}" == "0" ] || false' returned a non-zero code: 1`,
 		},
 		{
 			description: "build failure with concurrency=0",
 			args:        []string{"-p", "failed-dependency", "-p", "concurrency-0"},
-			failure:     `unable to stream build output: The command '/bin/sh -c [ "${FAIL}" == "0" ] || false' returned a non-zero code: 1`,
+			failure:     `docker build failure: The command '/bin/sh -c [ "${FAIL}" == "0" ] || false' returned a non-zero code: 1`,
 		},
 	}
 

diff --git a/pkg/skaffold/docker/image.go b/pkg/skaffold/docker/image.go
@@ -20,6 +20,7 @@ import (
 	"bufio"
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -364,6 +365,10 @@ func (l *localDaemon) Build(ctx context.Context, out io.Writer, workspace string
 	}
 
 	if err := streamDockerMessages(out, resp.Body, auxCallback); err != nil {
+		var jm *jsonmessage.JSONError
+		if errors.As(err, &jm) {
+			return "", fmt.Errorf("docker build failure: %w", err)
+		}
 		return "", fmt.Errorf("unable to stream build output: %w", err)
 	}