Merge branch 'bump-version-1.6.0' into 'master'

Bump version for 1.6.0 release

See merge request nvidia/container-toolkit/container-toolkit!78

Author: Evan Lezar

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

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))
 

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)

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 <[email protected]>  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

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 <[email protected]> 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 <[email protected]> 1.6.0-0.1.rc.3
 
 - Move OCI and command line checks for runtime to internal oci package