Merge branch 'empty-bundle' into 'master'

Bump version to 1.6.0-rc.2

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

.gitlab-ci.yml

@@ -31,8 +31,6 @@ include:
   rules:
     - if: $CI_COMMIT_TAG
       when: always
-    - if: $CI_MERGE_REQUEST_ID
-      when: always
 
 # The full set of build-all jobs organized to
 # have builds for each ARCH run in parallel.

Makefile

@@ -18,7 +18,7 @@ DIST_DIR ?= $(CURDIR)/dist
 
 LIB_NAME := nvidia-container-toolkit
 LIB_VERSION := 1.6.0
-LIB_TAG ?= rc.1
+LIB_TAG ?= rc.2
 
 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.1
+LIB_TAG := rc.2
 
 VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG))
 

cmd/nvidia-container-runtime/nvcr_test.go

@@ -18,7 +18,6 @@ package main
 
 import (
 	"fmt"
-	"os"
 	"strings"
 	"testing"
 
@@ -29,15 +28,12 @@ import (
 )
 
 func TestArgsGetConfigFilePath(t *testing.T) {
-	wd, err := os.Getwd()
-	require.NoError(t, err)
-
 	testCases := []struct {
 		bundleDir   string
 		ociSpecPath string
 	}{
 		{
-			ociSpecPath: fmt.Sprintf("%v/config.json", wd),
+			ociSpecPath: "config.json",
 		},
 		{
 			bundleDir:   "/foo/bar",

cmd/nvidia-container-runtime/runtime_factory.go

@@ -154,11 +154,10 @@ func isBundleFlag(arg string) bool {
 }
 
 // getOCISpecFilePath returns the expected path to the OCI specification file for the given
-// bundle directory or the current working directory if not specified.
+// bundle directory. If the bundle directory is empty, only `config.json` is returned.
 func getOCISpecFilePath(bundleDir string) (string, error) {
 	logger.Infof("Using bundle directory: %v", bundleDir)
 
-	// if bundleDir not specified, use "config.json" directly as cwd will always be the bundle path
 	OCISpecFilePath := filepath.Join(bundleDir, ociSpecFileName)
 
 	logger.Infof("Using OCI specification file path: %v", OCISpecFilePath)

packaging/debian/changelog

@@ -1,3 +1,9 @@
+nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium
+
+  * Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime
+
+ -- NVIDIA CORPORATION <cudatools@nvidia.com>  Tue, 26 Oct 2021 12:24:05 +0200
+
 nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium
 
   * Add AARCH64 package for Amazon Linux 2

packaging/rpm/SPECS/nvidia-container-toolkit.spec

@@ -64,6 +64,11 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
 /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
 
 %changelog
+
+* Tue Oct 26 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.2
+
+- Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime
+
 * Mon Sep 06 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.6.0-0.1.rc.1
 
 - Add AARCH64 package for Amazon Linux 2

third_party/libnvidia-container

@@ -1 +1 @@
-Subproject commit 1fa138a694b3667fd89ac89dfdb26fcd06ab0bb9
+Subproject commit fc1b6c4102fd0ccac155e2e26fec33c64bd06da2