From 58801d0c715ecfb89a0b2aacb874f2ea3ae3ee51 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Tue, 16 Nov 2021 21:37:50 +0100
Subject: [PATCH 1/3] Fix logging to stderr instead of file logger
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
internal/oci/runtime_low_level.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/internal/oci/runtime_low_level.go b/internal/oci/runtime_low_level.go
index 56c9e367..6363d2ec 100644
--- a/internal/oci/runtime_low_level.go
+++ b/internal/oci/runtime_low_level.go
@@ -32,7 +32,7 @@ func NewLowLevelRuntime(candidates ...string) (Runtime, error) {
// NewLowLevelRuntimeWithLogger creates a Runtime as with NewLowLevelRuntime using the specified logger.
func NewLowLevelRuntimeWithLogger(logger *log.Logger, candidates ...string) (Runtime, error) {
- runtimePath, err := findRuntime(candidates)
+ runtimePath, err := findRuntime(logger, candidates)
if err != nil {
return nil, fmt.Errorf("error locating runtime: %v", err)
}
@@ -42,19 +42,19 @@ func NewLowLevelRuntimeWithLogger(logger *log.Logger, candidates ...string) (Run
// findRuntime checks elements in a list of supplied candidates for a matching executable in the PATH.
// The absolute path to the first match is returned.
-func findRuntime(candidates []string) (string, error) {
+func findRuntime(logger *log.Logger, candidates []string) (string, error) {
if len(candidates) == 0 {
return "", fmt.Errorf("at least one runtime candidate must be specified")
}
for _, candidate := range candidates {
- log.Infof("Looking for runtime binary '%v'", candidate)
+ logger.Infof("Looking for runtime binary '%v'", candidate)
runcPath, err := exec.LookPath(candidate)
if err == nil {
- log.Infof("Found runtime binary '%v'", runcPath)
+ logger.Infof("Found runtime binary '%v'", runcPath)
return runcPath, nil
}
- log.Warnf("Runtime binary '%v' not found: %v", candidate, err)
+ logger.Warnf("Runtime binary '%v' not found: %v", candidate, err)
}
return "", fmt.Errorf("no runtime binary found from candidate list: %v", candidates)
From 2795e7d1324b64789f1ab44a27f26f2fb04eea9d Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Wed, 17 Nov 2021 10:07:36 +0100
Subject: [PATCH 2/3] Bump version to 1.6.0
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
Makefile | 2 +-
build/container/Makefile | 2 +-
packaging/debian/changelog | 7 +++++++
packaging/rpm/SPECS/nvidia-container-toolkit.spec | 4 ++++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 97fe3b5a..009419e9 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ DIST_DIR ?= $(CURDIR)/dist
LIB_NAME := nvidia-container-toolkit
LIB_VERSION := 1.6.0
-LIB_TAG ?= rc.3
+LIB_TAG ?=
GOLANG_VERSION := 1.16.3
MODULE := github.com/NVIDIA/nvidia-container-toolkit
diff --git a/build/container/Makefile b/build/container/Makefile
index ed036156..ec00a7b8 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -21,7 +21,7 @@ DIST_DIR ?= $(CURDIR)/dist
# TODO: These should be defined ONCE and currently duplicate the version in the
# toolkit makefile.
LIB_VERSION := 1.6.0
-LIB_TAG := rc.3
+LIB_TAG :=
VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG))
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 26ea10b6..aa4fb7fa 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,10 @@
+nvidia-container-toolkit (1.6.0-1) UNRELEASED; urgency=medium
+
+ * Promote 1.6.0~rc.3-1 to 1.6.0-1
+ * Fix unnecessary logging to stderr instead of configured nvidia-container-runtime log file
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com> Wed, 17 Nov 2021 09:25:15 +0100
+
nvidia-container-toolkit (1.6.0~rc.3-1) experimental; urgency=medium
* Move OCI and command line checks for runtime to internal oci package
diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
index 93f78b6d..29f10498 100644
--- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec
+++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
@@ -64,6 +64,10 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
/usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
%changelog
+* Wed Nov 17 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-1
+- Promote 1.6.0-0.1.rc.3 to 1.6.0-1
+- Fix unnecessary logging to stderr instead of configured nvidia-container-runtime log file
+
* Mon Nov 15 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.3
- Move OCI and command line checks for runtime to internal oci package
From 4d224a114a72d8effa60f7f1cfc426058363c12d Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Wed, 17 Nov 2021 11:43:46 +0100
Subject: [PATCH 3/3] Update components versions for 1.6.0 release
* libnvidia-container v1.6.0: dd2c49d6699e4d8529fbeaa58ee91554977b652e
* nvidia-container-runtime v3.6.0: 38ff520daa33d3a3a733440957c6aa346757bd1f
* nvidia-docker v2.7.0: fd3233aa5f4ade28ac6bda616c2fa77a0ce89cd9
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
third_party/libnvidia-container | 2 +-
third_party/nvidia-container-runtime | 2 +-
third_party/nvidia-docker | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
index ff6ed3d5..dd2c49d6 160000
--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit ff6ed3d5637f0537c4951a2757512108cc0ae147
+Subproject commit dd2c49d6699e4d8529fbeaa58ee91554977b652e
diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime
index ba4815e7..38ff520d 160000
--- a/third_party/nvidia-container-runtime
+++ b/third_party/nvidia-container-runtime
@@ -1 +1 @@
-Subproject commit ba4815e7eb31c23d839d58c94623ec53f4e8d368
+Subproject commit 38ff520daa33d3a3a733440957c6aa346757bd1f
diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker
index 34934c28..fd3233aa 160000
--- a/third_party/nvidia-docker
+++ b/third_party/nvidia-docker
@@ -1 +1 @@
-Subproject commit 34934c282707a1dc3f4341ead20a9e40d36ee618
+Subproject commit fd3233aa5f4ade28ac6bda616c2fa77a0ce89cd9