Skip to content

Commit 48b237f

Browse files
tonistiigithaJeztah
tonistiigi
authored and
thaJeztah
committed
vendor: update buildkit to v0.18.0-rc1
Signed-off-by: Tonis Tiigi <[email protected]>
1 parent 0b77888 commit 48b237f

138 files changed

Lines changed: 437 additions & 314 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎builder/builder-next/controller.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ func newSnapshotterController(ctx context.Context, rt http.RoundTripper, opt Opt
193193
LeaseManager: wo.LeaseManager,
194194
ContentStore: wo.ContentStore,
195195
TraceCollector: getTraceExporter(ctx),
196+
GarbageCollect: w.GarbageCollect,
196197
})
197198
}
198199

@@ -381,6 +382,7 @@ func newGraphDriverController(ctx context.Context, rt http.RoundTripper, opt Opt
381382
Layers: layers,
382383
Platforms: archutil.SupportedPlatforms(true),
383384
LeaseManager: lm,
385+
GarbageCollect: mdb.GarbageCollect,
384386
Labels: getLabels(opt, nil),
385387
}
386388

@@ -420,6 +422,7 @@ func newGraphDriverController(ctx context.Context, rt http.RoundTripper, opt Opt
420422
HistoryDB: historyDB,
421423
HistoryConfig: historyConf,
422424
TraceCollector: getTraceExporter(ctx),
425+
GarbageCollect: w.GarbageCollect,
423426
})
424427
}
425428

‎builder/builder-next/worker/worker.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"time"
99

1010
"github.com/containerd/containerd/content"
11+
"github.com/containerd/containerd/gc"
1112
"github.com/containerd/containerd/images"
1213
"github.com/containerd/containerd/rootfs"
1314
cerrdefs "github.com/containerd/errdefs"
@@ -77,6 +78,7 @@ type Opt struct {
7778
ContentStore *containerdsnapshot.Store
7879
CacheManager cache.Manager
7980
LeaseManager *leaseutil.Manager
81+
GarbageCollect func(context.Context) (gc.Stats, error)
8082
ImageSource *imageadapter.Source
8183
DownloadManager *xfer.LayerDownloadManager
8284
V2MetadataService distmetadata.V2MetadataService
@@ -184,6 +186,14 @@ func (w *Worker) BuildkitVersion() client.BuildkitVersion {
184186
}
185187
}
186188

189+
func (w *Worker) GarbageCollect(ctx context.Context) error {
190+
if w.Opt.GarbageCollect == nil {
191+
return nil
192+
}
193+
_, err := w.Opt.GarbageCollect(ctx)
194+
return err
195+
}
196+
187197
// Close closes the worker and releases all resources
188198
func (w *Worker) Close() error {
189199
return nil

‎vendor.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ require (
6363
github.com/miekg/dns v1.1.57
6464
github.com/mistifyio/go-zfs/v3 v3.0.1
6565
github.com/mitchellh/copystructure v1.2.0
66-
github.com/moby/buildkit v0.17.1
66+
github.com/moby/buildkit v0.18.0-rc1
6767
github.com/moby/docker-image-spec v1.3.1
6868
github.com/moby/ipvs v1.1.0
6969
github.com/moby/locker v1.0.1
@@ -197,7 +197,7 @@ require (
197197
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
198198
github.com/tinylib/msgp v1.1.8 // indirect
199199
github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 // indirect
200-
github.com/tonistiigi/fsutil v0.0.0-20241028165955-397af5306b5c // indirect
200+
github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 // indirect
201201
github.com/tonistiigi/go-actions-cache v0.0.0-20241108014124-394979b8119e // indirect
202202
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
203203
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect

‎vendor.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F
364364
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
365365
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
366366
github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
367-
github.com/moby/buildkit v0.17.1 h1:VWj6eIdk7u6acHPn2CiA+tdq0/mQoBEk9ckweRzWmPw=
368-
github.com/moby/buildkit v0.17.1/go.mod h1:ru8NFyDHD8HbuKaLXJIjK9nr3x6FZR+IWjtF07S+wdM=
367+
github.com/moby/buildkit v0.18.0-rc1 h1:fxurq9IkqaX7ZXRlxbBpY3DO7xw/vISJoNFw1Gtl4c0=
368+
github.com/moby/buildkit v0.18.0-rc1/go.mod h1:vCR5CX8NGsPTthTg681+9kdmfvkvqJBXEv71GZe5msU=
369369
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
370370
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
371371
github.com/moby/ipvs v1.1.0 h1:ONN4pGaZQgAx+1Scz5RvWV4Q7Gb+mvfRh3NsPS+1XQQ=
@@ -522,8 +522,8 @@ github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0=
522522
github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw=
523523
github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 h1:eUk79E1w8yMtXeHSzjKorxuC8qJOnyXQnLaJehxpJaI=
524524
github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205/go.mod h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY=
525-
github.com/tonistiigi/fsutil v0.0.0-20241028165955-397af5306b5c h1:bQLsfX+uEPZUjyR2qmoJs5F8Z57bPVmF3IsUf22Xo9Y=
526-
github.com/tonistiigi/fsutil v0.0.0-20241028165955-397af5306b5c/go.mod h1:Dl/9oEjK7IqnjAm21Okx/XIxUCFJzvh+XdVHUlBwXTw=
525+
github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184 h1:RgyoSI38Y36zjQaszel/0RAcIehAnjA1B0RiUV9SDO4=
526+
github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184/go.mod h1:Dl/9oEjK7IqnjAm21Okx/XIxUCFJzvh+XdVHUlBwXTw=
527527
github.com/tonistiigi/go-actions-cache v0.0.0-20241108014124-394979b8119e h1:SdcAL/tmv2mIfNhRygmeRrcci3aJQFqNughD7rcV170=
528528
github.com/tonistiigi/go-actions-cache v0.0.0-20241108014124-394979b8119e/go.mod h1:xsu+XeKT9piH/5f9Y1Zsv5krQqI34CWkIusbs5027IM=
529529
github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=

‎vendor/github.com/moby/buildkit/cache/blobs_linux.go‎

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

‎vendor/github.com/moby/buildkit/cache/blobs_nolinux.go‎

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

‎vendor/github.com/moby/buildkit/cache/compression_nydus.go‎

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

‎vendor/github.com/moby/buildkit/cache/contenthash/checksum.go‎

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

‎vendor/github.com/moby/buildkit/cache/contenthash/checksum_unix.go‎

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

‎vendor/github.com/moby/buildkit/cache/contenthash/filehash_unix.go‎

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

0 commit comments

Comments
 (0)