Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: github.com/moby/buildkit v0.13.0-rc2 #47364

Merged
merged 14 commits into from
Feb 27, 2024
Merged

vendor: github.com/moby/buildkit v0.13.0-rc2 #47364

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f90b03e
go.mod: bump to go 1.21 and use local toolchain when vendoring
crazy-max Feb 20, 2024
31545c3
vendor: github.com/moby/buildkit v0.13.0-rc2
vvoland Feb 19, 2024
dd69926
integration/build: Use new buildkit progressui
vvoland Feb 9, 2024
e68f712
integration/build: Use fsutil.NewFS
vvoland Feb 9, 2024
a79bb1e
builder-next/exporter: Sync with new signature
vvoland Feb 9, 2024
bc6d88c
cmd/dockerd: Fix overriding OTEL resource
vvoland Feb 9, 2024
b04a2da
builder/controller: Adjust NewWorkerOpt call
vvoland Feb 9, 2024
59ad169
builder-next: Adjust to source changes
vvoland Feb 9, 2024
fa467ca
builder-next/mobyexporter: Use OptKeyName const
vvoland Feb 9, 2024
e01a1c5
builder/mobyexporter: Set `image.name` response key
vvoland Feb 13, 2024
951e42c
builder-next: Replace ResolveImageConfig with ResolveSourceMetadata
vvoland Feb 16, 2024
f5722da
mobyexporter: Store temporary config descriptor
vvoland Feb 16, 2024
60358bf
ci(buildkit): dedicated step to build test image
crazy-max Feb 16, 2024
2d31532
otel: Default metrics protocol to http/protobuf
vvoland Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
integration/build: Use fsutil.NewFS 
StaticDirSource definition changed and can no longer be initialized from
the composite literal.

https://github.com/moby/buildkit/commits/a80b48544c029f0e28e1243407b55c916c7757f2

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
  • Loading branch information
@vvoland
vvoland committed Feb 27, 2024
commit e68f71259ad27842c85cad3db31cec94c7668291
6 changes: 5 additions & 1 deletion integration/build/build_session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/docker/docker/testutil/request"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/session/filesync"
"github.com/tonistiigi/fsutil"
"golang.org/x/sync/errgroup"
"gotest.tools/v3/assert"
is "gotest.tools/v3/assert/cmp"
Expand Down Expand Up @@ -95,8 +96,11 @@ func testBuildWithSession(ctx context.Context, t *testing.T, client dclient.APIC
sess, err := session.NewSession(ctx, "foo1", "foo")
assert.Check(t, err)

fs, err := fsutil.NewFS(dir)
assert.NilError(t, err)

fsProvider := filesync.NewFSSyncProvider(filesync.StaticDirSource{
"": {Dir: dir},
"": fs,
})
sess.Allow(fsProvider)

Expand Down
2 changes: 1 addition & 1 deletion vendor.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ require (
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/tonistiigi/fsutil v0.0.0-20240223190444-7a889f53dbf6
github.com/tonistiigi/go-archvariant v1.0.0
github.com/vbatts/tar-split v0.11.5
github.com/vishvananda/netlink v1.2.1-beta.2
Expand Down Expand Up @@ -186,7 +187,6 @@ require (
github.com/spdx/tools-golang v0.5.1 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/tinylib/msgp v1.1.8 // indirect
github.com/tonistiigi/fsutil v0.0.0-20240223190444-7a889f53dbf6 // indirect
github.com/tonistiigi/go-actions-cache v0.0.0-20220404170428-0bdeb6e1eac7 // indirect
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect
Expand Down