docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-11-03 17:43:42 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1275 from tonistiigi/update-buildx-220816

Browse Source 
vendor: update buildkit to 55ba9d14
This commit is contained in:
Tõnis Tiigi
2022-08-16 10:47:40 -07:00
committed by GitHub
parent fb5e1393a4 7f84582b37
commit f3c135e583
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -15,7 +15,7 @@ require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840
github.com/hashicorp/hcl/v2 v2.8.2 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/morikuni/aec v1.0.0
github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799

4
go.sum
View File

@@ -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.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= 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/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.20220816171719-55ba9d14360a h1:NI01Z14Hbwo1MHq8ylu4HNkmKGnhk8UZsD6c6FVMcA8=
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/go.mod h1:Wa+LkeUQ9NJTVXTAY38rhkfKVQcuCIo2fbavRSuGsbI=
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= 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/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=

8
vendor/github.com/moby/buildkit/frontend/subrequests/outline/outline.go generated vendored
View File

@@ -101,7 +101,7 @@ func PrintOutline(dt []byte, w io.Writer) error {
fmt.Fprintf(tw, "DESCRIPTION:\t%s\n", o.Description) fmt.Fprintf(tw, "DESCRIPTION:\t%s\n", o.Description)
} }
tw.Flush() tw.Flush()
fmt.Println() fmt.Fprintln(tw)
} }
if len(o.Args) > 0 { 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) fmt.Fprintf(tw, "%s\t%s\t%s\n", a.Name, a.Value, a.Description)
} }
tw.Flush() tw.Flush()
fmt.Println() fmt.Fprintln(tw)
} }
if len(o.Secrets) > 0 { 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) fmt.Fprintf(tw, "%s\t%s\n", s.Name, b)
} }
tw.Flush() tw.Flush()
fmt.Println() fmt.Fprintln(tw)
} }
if len(o.SSH) > 0 { 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) fmt.Fprintf(tw, "%s\t%s\n", s.Name, b)
} }
tw.Flush() tw.Flush()
fmt.Println() fmt.Fprintln(tw)
} }
return nil return nil

17
vendor/github.com/moby/buildkit/util/progress/progress.go generated vendored
View File

@@ -274,3 +274,20 @@ func (pw *noOpWriter) Write(_ string, _ interface{}) error {
func (pw *noOpWriter) Close() error { func (pw *noOpWriter) Close() error {
return nil 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
}
}

2
vendor/modules.txt vendored
View File

@@ -358,7 +358,7 @@ github.com/mitchellh/go-wordwrap
# github.com/mitchellh/mapstructure v1.5.0 # github.com/mitchellh/mapstructure v1.5.0
## explicit; go 1.14 ## explicit; go 1.14
github.com/mitchellh/mapstructure 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 ## explicit; go 1.17
github.com/moby/buildkit/api/services/control github.com/moby/buildkit/api/services/control
github.com/moby/buildkit/api/types github.com/moby/buildkit/api/types