From 888fe458ae1e06b9e0d08650c026b887e793bacf Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 7 Feb 2024 10:09:48 +0100 Subject: [PATCH 1/2] Bump version to v1.14.5 Signed-off-by: Evan Lezar --- CHANGELOG.md | 2 ++ versions.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d182aa8..dc598697 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # NVIDIA Container Toolkit Changelog +## v1.14.5 + ## v1.14.4 * Include `nvidia/nvoptix.bin` in list of graphics mounts. * Include `vulkan/icd.d/nvidia_layers.json` in list of graphics mounts. diff --git a/versions.mk b/versions.mk index 0bf66552..cc9f39af 100644 --- a/versions.mk +++ b/versions.mk @@ -13,7 +13,7 @@ # limitations under the License. LIB_NAME := nvidia-container-toolkit -LIB_VERSION := 1.14.4 +LIB_VERSION := 1.14.5 LIB_TAG := # The package version is the combination of the library version and tag. From 9d9260db8cce2c01cfcc0488b31dcc51355f3570 Mon Sep 17 00:00:00 2001 From: Evan Lezar <7723350-elezar@users.noreply.gitlab.com> Date: Tue, 23 Jan 2024 20:16:12 +0000 Subject: [PATCH 2/2] 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 --- CHANGELOG.md | 2 ++ cmd/nvidia-ctk/runtime/configure/configure.go | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc598697..7f03f2c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # NVIDIA Container Toolkit Changelog ## v1.14.5 +* Fix `nvidia-ctk runtime configure --cdi.enabled` for Docker. This was incorrectly setting `experimental = true` instead + of setting `features.cdi = true`. ## v1.14.4 * Include `nvidia/nvoptix.bin` in list of graphics mounts. diff --git a/cmd/nvidia-ctk/runtime/configure/configure.go b/cmd/nvidia-ctk/runtime/configure/configure.go index 145fef0e..cbb62677 100644 --- a/cmd/nvidia-ctk/runtime/configure/configure.go +++ b/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) }