docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2252 from ndeloof/rawjson

Browse Source 
don't print build details when progress is rawjson
This commit is contained in:
Tõnis Tiigi 2024-02-09 16:40:50 -08:00 committed by GitHub
commit 67d9385ce0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/bake.go
View File

@ -138,7 +138,7 @@ func runBake(ctx context.Context, dockerCli command.Cli, targets []string, in ba
if err == nil { if err == nil {
err = err1 err = err1
} }
if err == nil && progressMode != progressui.QuietMode { if err == nil && progressMode != progressui.QuietMode && progressMode != progressui.RawJSONMode {
desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term) desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term)
} }
} }

11
commands/build.go
View File

@ -294,10 +294,13 @@ func runBuild(ctx context.Context, dockerCli command.Cli, options buildOptions)
return retErr return retErr
} }
if progressMode != progressui.QuietMode { switch progressMode {
desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term) case progressui.RawJSONMode:
} else { // no additional display
case progressui.QuietMode:
fmt.Println(getImageID(resp.ExporterResponse)) fmt.Println(getImageID(resp.ExporterResponse))
default:
desktop.PrintBuildDetails(os.Stderr, printer.BuildRefs(), term)
} }
if options.imageIDFile != "" { if options.imageIDFile != "" {
if err := os.WriteFile(options.imageIDFile, []byte(getImageID(resp.ExporterResponse)), 0644); err != nil { if err := os.WriteFile(options.imageIDFile, []byte(getImageID(resp.ExporterResponse)), 0644); err != nil {
@ -753,7 +756,7 @@ func dockerUlimitToControllerUlimit(u *dockeropts.UlimitOpt) *controllerapi.Ulim
} }
func printWarnings(w io.Writer, warnings []client.VertexWarning, mode progressui.DisplayMode) { func printWarnings(w io.Writer, warnings []client.VertexWarning, mode progressui.DisplayMode) {
if len(warnings) == 0 || mode == progressui.QuietMode { if len(warnings) == 0 || mode == progressui.QuietMode || mode == progressui.RawJSONMode {
return return
} }
fmt.Fprintf(w, "\n ") fmt.Fprintf(w, "\n ")