Merge pull request docker#2374 from tonistiigi/print-json-format

handle json formatting for print
Mirantis · Apr 5, 2024 · 5c29e6e · 5c29e6e
2 parents 6a0d5b7 + 858e347
commit 5c29e6e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/commands/build.go b/commands/build.go
@@ -852,7 +852,9 @@ func printResult(f *controllerapi.PrintFunc, res map[string]string) error {
 	case "subrequests.describe":
 		return printValue(subrequests.PrintDescribe, subrequests.SubrequestsDescribeDefinition.Version, f.Format, res)
 	default:
-		if dt, ok := res["result.txt"]; ok {
+		if dt, ok := res["result.json"]; ok && f.Format == "json" {
+			fmt.Println(dt)
+		} else if dt, ok := res["result.txt"]; ok {
 			fmt.Print(dt)
 		} else {
 			log.Printf("%s %+v", f, res)