From 99889671b536069b25d9fe67971fca635b39fd83 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 3 Nov 2022 14:25:31 +0100 Subject: [PATCH 1/3] Update 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 90bc7a54..505dedfe 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit 90bc7a540add5857fcd30c1f4f3bede9b5b06f43 +Subproject commit 505dedfee84b6d8ac671c8ca4063a7c205a92237 From 5a56b658bacf89fde60fe69c480d186f70e838ee Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 3 Nov 2022 14:30:13 +0100 Subject: [PATCH 2/3] Update changelog Signed-off-by: Evan Lezar --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09369a47..4f0f902c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # NVIDIA Container Toolkit Changelog +## v1.12.0-rc.2 + +* Inject Direct Rendering Manager (DRM) devices into a container using the NVIDIA Container Runtime +* Improve logging of errors from the NVIDIA Container Runtime +* Improve CDI specification generation to support rootless podman +* Use `nvidia-ctk cdi generate` to generate CDI specifications instead of `nvidia-ctk info generate-cdi` +* [libnvidia-container] Skip creation of existing files when these are already mounted + ## v1.12.0-rc.1 * Add support for multiple Docker Swarm resources From 93c59f2d9c6b1cf83290b6b52276c61efdab6536 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 3 Nov 2022 14:38:11 +0100 Subject: [PATCH 3/3] Skip nvidia-container-runtime and nvidia-docker builds for release candidates Signed-off-by: Evan Lezar --- scripts/build-all-components.sh | 37 +++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/scripts/build-all-components.sh b/scripts/build-all-components.sh index 81f3c2be..145aa043 100755 --- a/scripts/build-all-components.sh +++ b/scripts/build-all-components.sh @@ -62,20 +62,25 @@ make -C ${NVIDIA_CONTAINER_TOOLKIT_ROOT} \ LIBNVIDIA_CONTAINER_TAG="${LIBNVIDIA_CONTAINER_TAG}" \ ${TARGET} -# We set the TOOLKIT_VERSION, TOOLKIT_TAG for the nvidia-container-runtime and nvidia-docker targets -# The LIB_TAG is also overridden to match the TOOLKIT_TAG. -# Build nvidia-container-runtime -make -C ${NVIDIA_CONTAINER_RUNTIME_ROOT} \ - LIB_VERSION="${NVIDIA_CONTAINER_RUNTIME_VERSION}" \ - LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ - TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \ - TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ - ${TARGET} +if [[ -z ${NVIDIA_CONTAINER_TOOLKIT_TAG} ]]; then + # We set the TOOLKIT_VERSION, TOOLKIT_TAG for the nvidia-container-runtime and nvidia-docker targets + # The LIB_TAG is also overridden to match the TOOLKIT_TAG. + # Build nvidia-container-runtime + make -C ${NVIDIA_CONTAINER_RUNTIME_ROOT} \ + LIB_VERSION="${NVIDIA_CONTAINER_RUNTIME_VERSION}" \ + LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ + TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \ + TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ + ${TARGET} -# Build nvidia-docker2 -make -C ${NVIDIA_DOCKER_ROOT} \ - LIB_VERSION="${NVIDIA_DOCKER_VERSION}" \ - LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ - TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \ - TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ - ${TARGET} + # Build nvidia-docker2 + make -C ${NVIDIA_DOCKER_ROOT} \ + LIB_VERSION="${NVIDIA_DOCKER_VERSION}" \ + LIB_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ + TOOLKIT_VERSION="${NVIDIA_CONTAINER_TOOLKIT_VERSION}" \ + TOOLKIT_TAG="${NVIDIA_CONTAINER_TOOLKIT_TAG}" \ + ${TARGET} + +else + echo "Skipping nvidia-container-runtime and nvidia-docker builds for release candidate" +fi