From 5f53ca0af5d4d925522b3e6bfa858957d7b8909c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Feb 2023 11:58:44 +0100 Subject: [PATCH 1/4] Add missing v1.12.0-rc.5 changelog entry Signed-off-by: Evan Lezar --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d43f2ea..37b1fd72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## v1.12.0-rc.5 +* Fix bug here the `nvidia-ctk` path was not properly resolved. This causes failures to run containers when the runtime is configured in `csv` mode or if the `NVIDIA_DRIVER_CAPABILITIES` includes `graphics` or `display` (e.g. `all`). + ## v1.12.0-rc.4 * Generate a minimum CDI spec version for improved compatibility. From 069536d59843f387a8db977e666c116c5b5a6111 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Feb 2023 12:00:08 +0100 Subject: [PATCH 2/4] Bump version to v1.12.0-rc.6 Signed-off-by: Evan Lezar --- CHANGELOG.md | 4 ++++ versions.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37b1fd72..6a99ee2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # NVIDIA Container Toolkit Changelog +## v1.12.0-rc.6 + +* [libnvidia-container] Add nvcubins.bin to DriverStore components under WSL2 + ## v1.12.0-rc.5 * Fix bug here the `nvidia-ctk` path was not properly resolved. This causes failures to run containers when the runtime is configured in `csv` mode or if the `NVIDIA_DRIVER_CAPABILITIES` includes `graphics` or `display` (e.g. `all`). diff --git a/versions.mk b/versions.mk index 145fb3f7..4121c635 100644 --- a/versions.mk +++ b/versions.mk @@ -14,7 +14,7 @@ LIB_NAME := nvidia-container-toolkit LIB_VERSION := 1.12.0 -LIB_TAG := rc.5 +LIB_TAG := rc.6 # Specify the nvidia-docker2 and nvidia-container-runtime package versions. # Note: The build tooling uses `LIB_TAG` above as the version tag. From fe117d3916e6e0dd10fbcbbcfb8ba01005b72985 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Feb 2023 12:02:57 +0100 Subject: [PATCH 3/4] Udpate libnvidia-container Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index 4b7f3d9b..cb0b5c23 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit 4b7f3d9bfb15928690c7bc8287cfb27c62dc2270 +Subproject commit cb0b5c230bf8db4a3f990cd83452f7dd78062ee8 From f8f415a6051fc0e967aa06afd0a68219a8421af6 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 2 Feb 2023 12:03:34 +0100 Subject: [PATCH 4/4] Ensure container-archive name is unique Signed-off-by: Evan Lezar --- .nvidia-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index d81c44dc..1a82598a 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -110,7 +110,7 @@ image-packaging: image: "${PULSE_IMAGE}" variables: IMAGE: "${CI_REGISTRY_IMAGE}/container-toolkit:${CI_COMMIT_SHORT_SHA}-${DIST}" - IMAGE_ARCHIVE: "container-toolkit.tar" + IMAGE_ARCHIVE: "container-toolkit-${DIST}-${ARCH}-${CI_JOB_ID}.tar" rules: - if: $SKIP_SCANS != "yes" - when: manual