Skip to content

Commit 6590ece

Browse files
committed
wip: add warnings after every progress output
1 parent 2ab8749 commit 6590ece

2 files changed

Lines changed: 27 additions & 6 deletions

File tree

commands/build.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,16 @@ func runBuild(dockerCli command.Cli, options buildOptions) (err error) {
225225
if err != nil {
226226
return err
227227
}
228-
printer, err := progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode, progressui.WithDesc(
229-
fmt.Sprintf("building with %q instance using %s driver", b.Name, b.Driver),
230-
fmt.Sprintf("%s:%s", b.Driver, b.Name),
231-
))
228+
var printer *progress.Printer
229+
printer, err = progress.NewPrinter(ctx2, os.Stderr, os.Stderr, progressMode,
230+
progressui.WithDesc(
231+
fmt.Sprintf("building with %q instance using %s driver", b.Name, b.Driver),
232+
fmt.Sprintf("%s:%s", b.Driver, b.Name),
233+
),
234+
progressui.WithOnDone(func(warnings []client.VertexWarning, err error) {
235+
printWarnings(os.Stderr, warnings, progressMode)
236+
}),
237+
)
232238
if err != nil {
233239
return err
234240
}
@@ -244,7 +250,6 @@ func runBuild(dockerCli command.Cli, options buildOptions) (err error) {
244250
if err := printer.Wait(); retErr == nil {
245251
retErr = err
246252
}
247-
printWarnings(os.Stderr, printer.Warnings(), progressMode)
248253
if retErr != nil {
249254
return retErr
250255
}

vendor/github.com/moby/buildkit/util/progress/progressui/display.go

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)