Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 27ecb03

Browse files
authored
Merge pull request #2102 from tiborvass/19.03-buildkit-vendor
[19.03] vendor: update buildkit to docker-19.03 Upstream-commit: 50bb8c70f308c352be3de40103727dda10bf725f Component: cli
2 parents bf41f6a + af02572 commit 27ecb03

19 files changed

Lines changed: 309 additions & 177 deletions

File tree

components/cli/cli/command/image/build_buildkit.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ func runBuildBuildKit(dockerCli command.Cli, options buildOptions) error {
156156
}
157157
w = f
158158
}
159-
s.Allow(filesync.NewFSSyncTarget(w))
159+
output := func(map[string]string) (io.WriteCloser, error) { return w, nil }
160+
s.Allow(filesync.NewFSSyncTarget(output))
160161
}
161162
}
162163

components/cli/vendor.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ github.com/Microsoft/go-winio 84b4ab48a50763fe7b3abcef38e5
5252
github.com/Microsoft/hcsshim 672e52e9209d1e53718c1b6a7d68cc9272654ab5
5353
github.com/miekg/pkcs11 6120d95c0e9576ccf4a78ba40855809dca31a9ed
5454
github.com/mitchellh/mapstructure f15292f7a699fcc1a38a80977f80a046874ba8ac
55-
github.com/moby/buildkit f238f1efb04f00bf0cc147141fda9ddb55c8bc49
55+
github.com/moby/buildkit ae10b292fefb00e0fbf9fecd1419c5f252e58895
5656
github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3
5757
github.com/modern-go/reflect2 4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd # 1.0.1
5858
github.com/morikuni/aec 39771216ff4c63d11f5e604076f9c45e8be1067b
@@ -73,7 +73,7 @@ github.com/spf13/cobra ef82de70bb3f60c65fb8eebacbb2
7373
github.com/spf13/pflag 4cb166e4f25ac4e8016a3595bbf7ea2e9aa85a2c https://github.com/thaJeztah/pflag.git # temporary fork with https://github.com/spf13/pflag/pull/170 applied, which isn't merged yet upstream
7474
github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
7575
github.com/theupdateframework/notary d6e1431feb32348e0650bf7551ac5cffd01d857b # v0.6.1
76-
github.com/tonistiigi/fsutil 3bbb99cdbd76619ab717299830c60f6f2a533a6b
76+
github.com/tonistiigi/fsutil 3d2716dd0a4d06ff854241c7e8b6f3f904e1719f
7777
github.com/tonistiigi/units 6950e57a87eaf136bbe44ef2ec8e75b9e3569de2
7878
github.com/xeipuuv/gojsonpointer 4e3ac2762d5f479393488629ee9370b50873b3a6
7979
github.com/xeipuuv/gojsonreference bd5ef7bd5415a7ac448318e64f11a24cd21e594b

components/cli/vendor/github.com/moby/buildkit/README.md

Lines changed: 146 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/cli/vendor/github.com/moby/buildkit/client/llb/exec.go

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/cli/vendor/github.com/moby/buildkit/client/llb/meta.go

Lines changed: 15 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/cli/vendor/github.com/moby/buildkit/client/llb/state.go

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

components/cli/vendor/github.com/moby/buildkit/client/solve.go

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

components/cli/vendor/github.com/moby/buildkit/frontend/gateway/grpcclient/client.go

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

components/cli/vendor/github.com/moby/buildkit/go.mod

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/cli/vendor/github.com/moby/buildkit/session/auth/auth.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)