Skip to content

Commit

Permalink
Update buildx to 0.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tianon committed Nov 29, 2023
1 parent dee1e37 commit 590a406
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 56 deletions.
6 changes: 6 additions & 0 deletions moby-buildx/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
moby-buildx (0.12.0-1) UNRELEASED; urgency=medium

* Update to 0.12.0

-- Tianon Gravi <[email protected]> Wed, 29 Nov 2023 10:09:12 -0800

moby-buildx (0.11.2-1) unstable; urgency=medium

* Update to 0.11.2
Expand Down
52 changes: 19 additions & 33 deletions moby-buildx/debian/patches/default-plain-progress.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,24 @@ Description: require explicit opt-in for "tty" progress mode
Author: Tianon Gravi <[email protected]>
Applied-Upstream: nack

diff --git a/util/progress/printer.go b/util/progress/printer.go
index fdc74d91..c6721730 100644
--- a/util/progress/printer.go
+++ b/util/progress/printer.go
@@ -103,7 +103,7 @@ func NewPrinter(ctx context.Context, w io.Writer, out console.File, mode string,
diff --git a/vendor/github.com/moby/buildkit/util/progress/progressui/display.go b/vendor/github.com/moby/buildkit/util/progress/progressui/display.go
index 01548229..04d41f84 100644
--- a/vendor/github.com/moby/buildkit/util/progress/progressui/display.go
+++ b/vendor/github.com/moby/buildkit/util/progress/progressui/display.go
@@ -145,14 +145,14 @@ const (
// For TtyMode to work, the io.Writer should also implement console.File.
func NewDisplay(out io.Writer, mode DisplayMode, opts ...DisplayOpt) (Display, error) {
switch mode {
case PrinterModeQuiet:
w = io.Discard
- case PrinterModeAuto, PrinterModeTty:
+ case PrinterModeTty:
if cons, err := console.ConsoleFromFile(out); err == nil {
c = cons
} else {
diff --git a/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go b/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go
index c400e412..7f47de46 100644
--- a/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go
+++ b/vendor/github.com/moby/buildkit/util/progress/progresswriter/printer.go
@@ -72,7 +72,7 @@ func NewPrinter(ctx context.Context, out console.File, mode string) (Writer, err

var c console.Console
switch mode {
- case "auto", "tty", "":
+ case "tty":
if cons, err := console.ConsoleFromFile(out); err == nil {
c = cons
} else {
@@ -80,7 +80,7 @@ func NewPrinter(ctx context.Context, out console.File, mode string) (Writer, err
return nil, errors.Wrap(err, "failed to get console")
}
- case AutoMode, TtyMode, DefaultMode:
+ case TtyMode:
if c, err := consoleFromWriter(out); err == nil {
return newConsoleDisplay(c, opts...), nil
} else if mode == "tty" {
return Display{}, errors.Wrap(err, "failed to get console")
}
- case "plain":
+ case "plain", "auto", "":
default:
return nil, errors.Errorf("invalid progress mode %s", mode)
}
fallthrough
- case PlainMode:
+ case PlainMode, AutoMode, DefaultMode:
return newPlainDisplay(out, opts...), nil
case RawJSONMode:
return newRawJSONDisplay(out, opts...), nil
22 changes: 0 additions & 22 deletions moby-buildx/debian/patches/resolve-mode-local.patch

This file was deleted.

1 change: 0 additions & 1 deletion moby-buildx/debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ classic-plain-progress.patch
containerd-arm64-v8.patch
default-plain-progress.patch
no-git-by-default.patch
resolve-mode-local.patch

0 comments on commit 590a406

Please sign in to comment.