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

Fix --cdi.enabled for Docker

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

Signed-off-by: Evan Lezar <elezar@nvidia.com>

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":
 		return cfg.Set("enable_cdi", true)
 	case "docker":
-		return cfg.Set("experimental", true)
+		return cfg.Set("features", map[string]bool{"cdi": true})
 	}
 	return fmt.Errorf("enabling CDI in %s is not supported", config.runtime)
 }