From 4e6e0ed4f148116676989862f1bff9a278f745f0 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 22 Jul 2020 13:27:13 +0000 Subject: [PATCH 1/4] Add 'ngx' to list of *all* driver capabilities Signed-off-by: Kevin Klues --- pkg/container_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/container_config.go b/pkg/container_config.go index e515f420..c20a55e6 100644 --- a/pkg/container_config.go +++ b/pkg/container_config.go @@ -26,7 +26,7 @@ const ( ) const ( - allDriverCapabilities = "compute,compat32,graphics,utility,video,display" + allDriverCapabilities = "compute,compat32,graphics,utility,video,display,ngx" defaultDriverCapabilities = "utility" ) From 2f4af74320eb8cc3f679d0e8bc9e08b2f77a4321 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 22 Jul 2020 13:38:40 +0000 Subject: [PATCH 2/4] List config.toml as a config file in the RPM SPEC Signed-off-by: Kevin Klues --- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 8b06aab3..5a6f6b39 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -48,7 +48,7 @@ rm -f %{_bindir}/nvidia-container-runtime-hook %files %license LICENSE %{_bindir}/nvidia-container-toolkit -/etc/nvidia-container-runtime/config.toml +%config /etc/nvidia-container-runtime/config.toml /usr/libexec/oci/hooks.d/oci-nvidia-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json From d467b87ef9e551787d98a31b748555523003cf0f Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 22 Jul 2020 13:34:14 +0000 Subject: [PATCH 3/4] Bump version to 1.2.1 Signed-off-by: Kevin Klues --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 771da990..060fe412 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ MKDIR ?= mkdir DIST_DIR ?= $(CURDIR)/dist LIB_NAME := nvidia-container-toolkit -LIB_VERSION := 1.2.0 +LIB_VERSION := 1.2.1 GOLANG_VERSION := 1.14.2 GOLANG_PKG_PATH := github.com/NVIDIA/container-toolkit/pkg From ba9758c7ffa6f487d82d109247e857254ad7ef44 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Wed, 22 Jul 2020 13:41:33 +0000 Subject: [PATCH 4/4] Update changelogs for 1.2.1 Signed-off-by: Kevin Klues --- packaging/debian/changelog | 7 +++++++ packaging/rpm/SPECS/nvidia-container-toolkit.spec | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 29ba8878..962dd78b 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,10 @@ +nvidia-container-toolkit (1.2.1-1) UNRELEASED; urgency=medium + + * 4e6e0ed4 Add 'ngx' to list of *all* driver capabilities + * 2f4af743 List config.toml as a config file in the RPM SPEC + + -- NVIDIA CORPORATION Wed, 22 Jul 2020 15:36:12 -0700 + nvidia-container-toolkit (1.2.0-1) UNRELEASED; urgency=medium * 8e0aab46 Fix repo listed in changelog for debian distributions diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 5a6f6b39..acfe99df 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -53,6 +53,10 @@ rm -f %{_bindir}/nvidia-container-runtime-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json %changelog +* Wed Jul 22 2020 NVIDIA CORPORATION 1.2.1-1 +- 4e6e0ed4 Add 'ngx' to list of *all* driver capabilities +- 2f4af743 List config.toml as a config file in the RPM SPEC + * Wed Jul 08 2020 NVIDIA CORPORATION 1.2.0-1 - 8e0aab46 Fix repo listed in changelog for debian distributions - 320bb6e4 Update dependence on libnvidia-container to 1.2.0