Skip to content

Commit e31d0d2

Browse files
dtrudgdtrudg
authored
Merge pull request #3572 from sylabs/dependabot/go_modules/release-4.3/moby-e8cf86216f
chore(deps): bump the moby group with 3 updates
2 parents 9269bd1 + 89dee98 commit e31d0d2

File tree

5 files changed

+32
-24
lines changed

5 files changed

+32
-24
lines changed

‎go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ require (
2121
github.com/containers/image/v5 v5.34.1
2222
github.com/coreos/go-systemd/v22 v22.5.0
2323
github.com/cyphar/filepath-securejoin v0.4.1
24-
github.com/docker/cli v27.5.1+incompatible
24+
github.com/docker/cli v28.0.1+incompatible
2525
github.com/docker/distribution v2.8.3+incompatible
26-
github.com/docker/docker v27.5.1+incompatible
26+
github.com/docker/docker v28.0.1+incompatible
2727
github.com/docker/go-units v0.5.0
2828
github.com/fatih/color v1.18.0
2929
github.com/go-log/log v0.2.0
3030
github.com/gofrs/flock v0.12.1
31-
github.com/google/go-containerregistry v0.20.3
31+
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f
3232
github.com/google/uuid v1.6.0
3333
github.com/gosimple/slug v1.15.0
34-
github.com/moby/buildkit v0.19.0
34+
github.com/moby/buildkit v0.20.0
3535
github.com/moby/sys/sequential v0.6.0
3636
github.com/moby/sys/userns v0.1.0
3737
github.com/moby/term v0.5.2
@@ -94,7 +94,7 @@ require (
9494
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9595
github.com/cilium/ebpf v0.16.0 // indirect
9696
github.com/cloudflare/circl v1.3.7 // indirect
97-
github.com/containerd/cgroups/v3 v3.0.3 // indirect
97+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
9898
github.com/containerd/console v1.0.4 // indirect
9999
github.com/containerd/containerd/api v1.8.0 // indirect
100100
github.com/containerd/errdefs v1.0.0 // indirect
@@ -191,7 +191,7 @@ require (
191191
github.com/oklog/ulid v1.3.1 // indirect
192192
github.com/opencontainers/go-digest v1.0.0 // indirect
193193
github.com/opentracing/opentracing-go v1.2.0 // indirect
194-
github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170 // indirect
194+
github.com/package-url/packageurl-go v0.1.1 // indirect
195195
github.com/pelletier/go-toml v1.9.5 // indirect
196196
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
197197
github.com/pierrec/lz4/v4 v4.1.21 // indirect
@@ -241,7 +241,7 @@ require (
241241
github.com/vbatts/go-mtree v0.5.0 // indirect
242242
github.com/vbatts/tar-split v0.11.7 // indirect
243243
github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd93d350 // indirect
244-
github.com/vishvananda/netns v0.0.4 // indirect
244+
github.com/vishvananda/netns v0.0.5 // indirect
245245
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
246246
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
247247
github.com/xeipuuv/gojsonschema v1.2.0 // indirect

‎go.sum

+14-13
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,8 @@ github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUo
213213
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
214214
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ=
215215
github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w=
216-
github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0=
217-
github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
216+
github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=
217+
github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
218218
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
219219
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
220220
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
@@ -289,13 +289,13 @@ github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi
289289
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
290290
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
291291
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
292-
github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3LKVc6cqWaY=
293-
github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
292+
github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs=
293+
github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
294294
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
295295
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
296296
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
297-
github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
298-
github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
297+
github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
298+
github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
299299
github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
300300
github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
301301
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -436,8 +436,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
436436
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
437437
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
438438
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
439-
github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM7kqkbXTpyiovI=
440-
github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
439+
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f h1:q+kbH7LI4wK3gNCxyvy2rFldJqAAB+Gch79/xj9/+GU=
440+
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f/go.mod h1:UnXV0UkKqoHbzwn49vfozmwMcLMS8XLLsVKVuhv3cGc=
441441
github.com/google/go-github/v55 v55.0.0 h1:4pp/1tNMB9X/LuAhs5i0KQAE40NmiR/y6prLNb9x9cg=
442442
github.com/google/go-github/v55 v55.0.0/go.mod h1:JLahOTA1DnXzhxEymmFF5PP2tSS9JVNj68mSZNDwskA=
443443
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -616,8 +616,8 @@ github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4
616616
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
617617
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE=
618618
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
619-
github.com/moby/buildkit v0.19.0 h1:w9G1p7sArvCGNkpWstAqJfRQTXBKukMyMK1bsah1HNo=
620-
github.com/moby/buildkit v0.19.0/go.mod h1:WiHBFTgWV8eB1AmPxIWsAlKjUACAwm3X/14xOV4VWew=
619+
github.com/moby/buildkit v0.20.0 h1:aF5RujjQ310Pn6SLL/wQYIrSsPXy0sQ5KvWifwq1h8Y=
620+
github.com/moby/buildkit v0.20.0/go.mod h1:HYFUIK+iGDRxRgdphZ9Nv0y1Fz7mv0HrU7xZoXx217E=
621621
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
622622
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
623623
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
@@ -705,8 +705,8 @@ github.com/opencontainers/umoci v0.4.7 h1:mbIbtMpZ3v9oMpKaLopnWoLykgmnixeLzq51Ez
705705
github.com/opencontainers/umoci v0.4.7/go.mod h1:lgJ4bnwJezsN1o/5d7t/xdRPvmf8TvBko5kKYJsYvgo=
706706
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
707707
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
708-
github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170 h1:DiLBVp4DAcZlBVBEtJpNWZpZVq0AEeCY7Hqk8URVs4o=
709-
github.com/package-url/packageurl-go v0.1.1-0.20220428063043-89078438f170/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=
708+
github.com/package-url/packageurl-go v0.1.1 h1:KTRE0bK3sKbFKAk3yy63DpeskU7Cvs/x/Da5l+RtzyU=
709+
github.com/package-url/packageurl-go v0.1.1/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=
710710
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
711711
github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
712712
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
@@ -937,8 +937,9 @@ github.com/vbauerster/mpb/v8 v8.9.3 h1:PnMeF+sMvYv9u23l6DO6Q3+Mdj408mjLRXIzmUmU2
937937
github.com/vbauerster/mpb/v8 v8.9.3/go.mod h1:hxS8Hz4C6ijnppDSIX6LjG8FYJSoPo9iIOcE53Zik0c=
938938
github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd93d350 h1:w5OI+kArIBVksl8UGn6ARQshtPCQvDsbuA9NQie3GIg=
939939
github.com/vishvananda/netlink v1.3.1-0.20240922070040-084abd93d350/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
940-
github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
941940
github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
941+
github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
942+
github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
942943
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
943944
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
944945
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

‎internal/pkg/build/buildkit/auth/authprovider.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ func NewAuthProvider(authConf *authn.AuthConfig, reqAuthFile string) session.Att
8282
cf.AuthConfigs[dockerHubConfigfileKey] = cf.AuthConfigs[dockerHubConfigfileCompatKey]
8383
}
8484

85-
return authprovider.NewDockerAuthProvider(cf, nil)
85+
return authprovider.NewDockerAuthProvider(authprovider.DockerAuthProviderConfig{
86+
ConfigFile: cf,
87+
})
8688
}
8789

8890
type authProvider struct {

‎internal/pkg/build/buildkit/daemon/daemon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ func ociWorkerInitializer(ctx context.Context, common workerInitializerOpt) ([]w
335335
cfg.Binary = r
336336
sylog.Debugf("%s: using %q runtime for buildkitd daemon.", DaemonName, filepath.Base(r))
337337

338-
opt, err := NewWorkerOpt(ctx, common.config.Root, snFactory, cfg.Rootless, processMode, cfg.Labels, idmapping, nc, dns, cfg.Binary, cfg.ApparmorProfile, cfg.SELinux, parallelismSem, "", cfg.DefaultCgroupParent)
338+
opt, err := NewWorkerOpt(ctx, common.config.Root, snFactory, cfg.Rootless, processMode, cfg.Labels, idmapping, nc, dns, cfg.Binary, cfg.ApparmorProfile, cfg.SELinux, parallelismSem, "", cfg.DefaultCgroupParent, nil)
339339
if err != nil {
340340
return nil, err
341341
}

‎internal/pkg/build/buildkit/daemon/executor.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ import (
5555
gatewayapi "github.com/moby/buildkit/frontend/gateway/pb"
5656
"github.com/moby/buildkit/identity"
5757
containerdsnapshot "github.com/moby/buildkit/snapshot/containerd"
58+
"github.com/moby/buildkit/solver/llbsolver/cdidevices"
5859
"github.com/moby/buildkit/solver/pb"
5960
"github.com/moby/buildkit/util/leaseutil"
6061
bknet "github.com/moby/buildkit/util/network"
@@ -79,7 +80,7 @@ type BkSnapshotterFactory struct {
7980
}
8081

8182
// NewWorkerOpt creates a WorkerOpt.
82-
func NewWorkerOpt(ctx context.Context, root string, snFactory BkSnapshotterFactory, rootless bool, processMode bkoci.ProcessMode, labels map[string]string, idmap *idtools.IdentityMapping, nopt netproviders.Opt, dns *bkoci.DNSConfig, binary, apparmorProfile string, selinux bool, parallelismSem *semaphore.Weighted, traceSocket, defaultCgroupParent string) (base.WorkerOpt, error) {
83+
func NewWorkerOpt(ctx context.Context, root string, snFactory BkSnapshotterFactory, rootless bool, processMode bkoci.ProcessMode, labels map[string]string, idmap *idtools.IdentityMapping, nopt netproviders.Opt, dns *bkoci.DNSConfig, binary, apparmorProfile string, selinux bool, parallelismSem *semaphore.Weighted, traceSocket, defaultCgroupParent string, cdiManager *cdidevices.Manager) (base.WorkerOpt, error) {
8384
var opt base.WorkerOpt
8485
name := "runc-" + snFactory.Name
8586
root = filepath.Join(root, name)
@@ -208,6 +209,7 @@ func NewWorkerOpt(ctx context.Context, root string, snFactory BkSnapshotterFacto
208209
ParallelismSem: parallelismSem,
209210
MountPoolRoot: filepath.Join(root, "cachemounts"),
210211
ResourceMonitor: rm,
212+
CDIManager: cdiManager,
211213
}
212214
return opt, nil
213215
}
@@ -231,6 +233,7 @@ type WorkerOpt struct {
231233
SELinux bool
232234
TracingSocket string
233235
ResourceMonitor *resources.Monitor
236+
CDIManager *cdidevices.Manager
234237
}
235238

236239
var defaultCommandCandidates = []string{"buildkit-runc", "runc"}
@@ -252,6 +255,7 @@ type buildExecutor struct {
252255
selinux bool
253256
tracingSocket string
254257
resmon *resources.Monitor
258+
cdiManager *cdidevices.Manager
255259
}
256260

257261
func NewBuildExecutor(opt WorkerOpt, networkProviders map[pb.NetMode]bknet.Provider) (executor.Executor, error) {
@@ -318,6 +322,7 @@ func NewBuildExecutor(opt WorkerOpt, networkProviders map[pb.NetMode]bknet.Provi
318322
selinux: opt.SELinux,
319323
tracingSocket: opt.TracingSocket,
320324
resmon: opt.ResourceMonitor,
325+
cdiManager: opt.CDIManager,
321326
}
322327
return w, nil
323328
}
@@ -443,7 +448,7 @@ func (w *buildExecutor) Run(ctx context.Context, id string, root executor.Mount,
443448
}
444449
}
445450

446-
spec, cleanup, err := bkoci.GenerateSpec(ctx, meta, mounts, id, resolvConf, hostsFile, namespace, w.cgroupParent, w.processMode, w.idmap, w.apparmorProfile, w.selinux, w.tracingSocket, opts...)
451+
spec, cleanup, err := bkoci.GenerateSpec(ctx, meta, mounts, id, resolvConf, hostsFile, namespace, w.cgroupParent, w.processMode, w.idmap, w.apparmorProfile, w.selinux, w.tracingSocket, w.cdiManager, opts...)
447452
if err != nil {
448453
return nil, err
449454
}

0 commit comments

Comments
 (0)