InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50078 from vvoland/cdi-default-cache

Browse Source 
daemon: Configure default CDI cache
This commit is contained in:
Paweł Gronowski
2025-06-12 11:36:32 +00:00
committed by GitHub
parent 5bbdb066d8 027588eba0
commit b5d26e5883
5 changed files with 31 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/dockerd/daemon.go
View File

@@ -251,8 +251,9 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {
// In order to lift this restriction the following would have to be addressed:
// - Support needs to be added to the cdi package for injecting Windows devices: https://tags.cncf.io/container-device-interface/issues/28
// - The DeviceRequests API must be extended to non-linux platforms.
var cdiCache *cdi.Cache
if cdiEnabled(cli.Config) {
daemon.RegisterCDIDriver(cli.Config.CDISpecDirs...)
cdiCache = daemon.RegisterCDIDriver(cli.Config.CDISpecDirs...)
}
var apiServer apiserver.Server
@@ -289,7 +290,7 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {
// initialized the cluster.
d.RestartSwarmContainers()
b, shutdownBuildKit, err := initBuildkit(ctx, d)
b, shutdownBuildKit, err := initBuildkit(ctx, d, cdiCache)
if err != nil {
return fmt.Errorf("error initializing buildkit: %w", err)
}
@@ -390,7 +391,7 @@ func setOTLPProtoDefault() {
}
}
func initBuildkit(ctx context.Context, d *daemon.Daemon) (_ builderOptions, closeFn func(), _ error) {
func initBuildkit(ctx context.Context, d *daemon.Daemon, cdiCache *cdi.Cache) (_ builderOptions, closeFn func(), _ error) {
log.G(ctx).Info("Initializing buildkit")
closeFn = func() {}
@@ -406,11 +407,6 @@ func initBuildkit(ctx context.Context, d *daemon.Daemon) (_ builderOptions, clos
cfg := d.Config()
var cdiSpecDirs []string
if cdiEnabled(&cfg) {
cdiSpecDirs = cfg.CDISpecDirs
}
bk, err := buildkit.New(ctx, buildkit.Opt{
SessionManager: sm,
Root: filepath.Join(cfg.Root, "buildkit"),
@@ -433,7 +429,7 @@ func initBuildkit(ctx context.Context, d *daemon.Daemon) (_ builderOptions, clos
Exported: d.ImageExportedByBuildkit,
Named: d.ImageNamedByBuildkit,
},
CDISpecDirs: cdiSpecDirs,
CDICache: cdiCache,
})
if err != nil {
return builderOptions{}, closeFn, errors.Wrap(err, "error creating buildkit instance")