UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 16:29:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix --cdi.enabled for Docker

See merge request nvidia/container-toolkit/container-toolkit!541
This commit is contained in:
Evan Lezar 2024-01-23 20:16:12 +00:00
commit 738ebd83d3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

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

3
cmd/nvidia-ctk/runtime/configure/configure.go
View File

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