Merge branch 'fix-cdi-enable-docker' into 'main'

Fix --cdi.enabled for Docker

See merge request nvidia/container-toolkit/container-toolkit!541

Author: Evan Lezar

CHANGELOG.md

@@ -10,6 +10,7 @@
 * Fix bug in determining default nvidia-container-runtime.user config value on SUSE-based systems.
 * Add `crun` to the list of configured low-level runtimes.
 * Added support for `--ldconfig-path` to `nvidia-ctk cdi generate` command.
+* Fix `nvidia-ctk runtime configure --cdi.enabled` for Docker.
 
 * [toolkit-container] Bump CUDA base image version to 12.3.1.
 

cmd/nvidia-ctk/runtime/configure/configure.go

@@ -149,6 +149,7 @@ func (m command) build() *cli.Command {
 		},
 		&cli.BoolFlag{
 			Name:        "cdi.enabled",
+			Aliases:     []string{"cdi.enable"},
 			Usage:       "Enable CDI in the configured runtime",
 			Destination: &config.cdi.enabled,
 		},
@@ -310,7 +311,7 @@ func enableCDI(config *config, cfg engine.Interface) error {
 	case "containerd":
 		cfg.Set("enable_cdi", true)
 	case "docker":
-		cfg.Set("experimental", true)
+		cfg.Set("features", map[string]bool{"cdi": true})
 	default:
 		return fmt.Errorf("enabling CDI in %s is not supported", config.runtime)
 	}