diff --git a/go.mod b/go.mod index d85786d0..f5768c91 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 github.com/hashicorp/hcl/v2 v2.8.2 - github.com/moby/buildkit v0.10.1-0.20220809151411-8488654e899b + github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a github.com/morikuni/aec v1.0.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 diff --git a/go.sum b/go.sum index 22938011..98c9c869 100644 --- a/go.sum +++ b/go.sum @@ -411,8 +411,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/moby/buildkit v0.10.1-0.20220809151411-8488654e899b h1:F/f/Ixaw8REoF5EjkMLh/2RBrsP0jeCPGBlczfqy9aw= -github.com/moby/buildkit v0.10.1-0.20220809151411-8488654e899b/go.mod h1:Wa+LkeUQ9NJTVXTAY38rhkfKVQcuCIo2fbavRSuGsbI= +github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a h1:NI01Z14Hbwo1MHq8ylu4HNkmKGnhk8UZsD6c6FVMcA8= +github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a/go.mod h1:Wa+LkeUQ9NJTVXTAY38rhkfKVQcuCIo2fbavRSuGsbI= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= diff --git a/vendor/github.com/moby/buildkit/frontend/subrequests/outline/outline.go b/vendor/github.com/moby/buildkit/frontend/subrequests/outline/outline.go index 3050dc4b..c0a376b0 100644 --- a/vendor/github.com/moby/buildkit/frontend/subrequests/outline/outline.go +++ b/vendor/github.com/moby/buildkit/frontend/subrequests/outline/outline.go @@ -101,7 +101,7 @@ func PrintOutline(dt []byte, w io.Writer) error { fmt.Fprintf(tw, "DESCRIPTION:\t%s\n", o.Description) } tw.Flush() - fmt.Println() + fmt.Fprintln(tw) } if len(o.Args) > 0 { @@ -111,7 +111,7 @@ func PrintOutline(dt []byte, w io.Writer) error { fmt.Fprintf(tw, "%s\t%s\t%s\n", a.Name, a.Value, a.Description) } tw.Flush() - fmt.Println() + fmt.Fprintln(tw) } if len(o.Secrets) > 0 { @@ -125,7 +125,7 @@ func PrintOutline(dt []byte, w io.Writer) error { fmt.Fprintf(tw, "%s\t%s\n", s.Name, b) } tw.Flush() - fmt.Println() + fmt.Fprintln(tw) } if len(o.SSH) > 0 { @@ -139,7 +139,7 @@ func PrintOutline(dt []byte, w io.Writer) error { fmt.Fprintf(tw, "%s\t%s\n", s.Name, b) } tw.Flush() - fmt.Println() + fmt.Fprintln(tw) } return nil diff --git a/vendor/github.com/moby/buildkit/util/progress/progress.go b/vendor/github.com/moby/buildkit/util/progress/progress.go index 83ca6672..4fabf376 100644 --- a/vendor/github.com/moby/buildkit/util/progress/progress.go +++ b/vendor/github.com/moby/buildkit/util/progress/progress.go @@ -274,3 +274,20 @@ func (pw *noOpWriter) Write(_ string, _ interface{}) error { func (pw *noOpWriter) Close() error { return nil } + +func OneOff(ctx context.Context, id string) func(err error) error { + pw, _, _ := NewFromContext(ctx) + now := time.Now() + st := Status{ + Started: &now, + } + pw.Write(id, st) + return func(err error) error { + // TODO: set error on status + now := time.Now() + st.Completed = &now + pw.Write(id, st) + pw.Close() + return err + } +} diff --git a/vendor/modules.txt b/vendor/modules.txt index d7b3e135..b0c3cedc 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -358,7 +358,7 @@ github.com/mitchellh/go-wordwrap # github.com/mitchellh/mapstructure v1.5.0 ## explicit; go 1.14 github.com/mitchellh/mapstructure -# github.com/moby/buildkit v0.10.1-0.20220809151411-8488654e899b +# github.com/moby/buildkit v0.10.1-0.20220816171719-55ba9d14360a ## explicit; go 1.17 github.com/moby/buildkit/api/services/control github.com/moby/buildkit/api/types