buildkitd: update default cdi spec dirs

crazy-max · crazy-max · commit 33f21640c3c9 · 2025-02-11T11:21:45.000+01:00
Signed-off-by: CrazyMax &lt;1951866+crazy-max@users.noreply.github.com&gt;
diff --git a/docs/buildkitd.toml.md b/docs/buildkitd.toml.md
@@ -51,7 +51,7 @@ insecure-entitlements = [ "network.host", "security.insecure" ]
   enabled = true
   # List of directories to scan for CDI spec files. For more details about CDI
   # specification, please refer to https://github.com/cncf-tags/container-device-interface/blob/main/SPEC.md#cdi-json-specification
-  specDirs = ["/etc/cdi", "/var/run/cdi"]
+  specDirs = ["/etc/cdi", "/var/run/cdi", "/etc/buildkit/cdi"]
 
 # config for build history API that stores information about completed build commands
 [history]
diff --git a/util/appdefaults/appdefaults_unix.go b/util/appdefaults/appdefaults_unix.go
@@ -17,7 +17,7 @@ const (
 
 var (
 	UserCNIConfigPath = filepath.Join(UserConfigDir(), "cni.json")
-	CDISpecDirs       = []string{"/etc/buildkit/cdi"}
+	CDISpecDirs       = []string{"/etc/cdi", "/var/run/cdi", "/etc/buildkit/cdi"}
 )
 
 // UserAddress typically returns /run/user/$UID/buildkit/buildkitd.sock

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ const (`
`17`	`17`
`18`	`18`	`var (`
`19`	`19`	`UserCNIConfigPath = filepath.Join(UserConfigDir(), "cni.json")`
`20`		`- CDISpecDirs = []string{"/etc/buildkit/cdi"}`
	`20`	`+ CDISpecDirs = []string{"/etc/cdi", "/var/run/cdi", "/etc/buildkit/cdi"}`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`// UserAddress typically returns /run/user/$UID/buildkit/buildkitd.sock`