Merge branch 'fix-nvidia-ctk-path' into 'main'

Only use configured nvidia-ctk path if it is a full path

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

CHANGELOG.md

@@ -1,10 +1,13 @@
 # NVIDIA Container Toolkit Changelog
 
+## v1.12.0-rc.5
+
 ## v1.12.0-rc.4
 
 * Generate a minimum CDI spec version for improved compatibility.
 * Add `--device-name-strategy` options to the `nvidia-ctk cdi generate` command that can be used to control how device names are constructed.
 * Set default for CDI device name generation to `index` to generate device names such as `nvidia.com/gpu=0` or `nvidia.com/gpu=1:0` by default.
+
 ## v1.12.0-rc.3
 
 * Don't fail if by-path symlinks for DRM devices do not exist

build/container/Dockerfile.packaging

@@ -18,19 +18,22 @@ ARG GOLANG_VERSION=x.x.x
 
 FROM nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST}
 
-ARG VERSION="N/A"
-
 ARG ARTIFACTS_ROOT
 COPY ${ARTIFACTS_ROOT} /artifacts/packages/
 
 WORKDIR /artifacts/packages
 
+# build-args are added to the manifest.txt file below.
+ARG BASE_DIST
+ARG PACKAGE_DIST
+ARG PACKAGE_VERSION
 ARG GIT_BRANCH
 ARG GIT_COMMIT
 ARG SOURCE_DATE_EPOCH
+ARG VERSION
 
 # Create a manifest.txt file with the absolute paths of all deb and rpm packages in the container
-RUN echo "IMAGE_EPOCH=$(date '+%s')" | sed 's/^/#/g' > /artifacts/manifest.txt && \
+RUN echo "#IMAGE_EPOCH=$(date '+%s')" > /artifacts/manifest.txt && \
     env | sed 's/^/#/g' >> /artifacts/manifest.txt && \
     find /artifacts/packages -iname '*.deb' -o -iname '*.rpm' >> /artifacts/manifest.txt
 

internal/discover/hooks.go

@@ -39,22 +39,24 @@ func CreateNvidiaCTKHook(executable string, hookName string, additionalArgs ...s
 }
 
 // FindNvidiaCTK locates the nvidia-ctk executable to be used in hooks.
-// If an override is specified, this is used instead.
-func FindNvidiaCTK(logger *logrus.Logger, override string) string {
-	if override != "" {
-		logger.Debugf("Using specified NVIDIA Container Toolkit CLI path %v", override)
-		return override
+// If an nvidia-ctk path is specified as an absolute path, it is used directly
+// without checking for existence of an executable at that path.
+func FindNvidiaCTK(logger *logrus.Logger, nvidiaCTKPath string) string {
+	if filepath.IsAbs(nvidiaCTKPath) {
+		logger.Debugf("Using specified NVIDIA Container Toolkit CLI path %v", nvidiaCTKPath)
+		return nvidiaCTKPath
 	}
 
+	logger.Debugf("Locating NVIDIA Container Toolkit CLI as %v", nvidiaCTKPath)
 	lookup := lookup.NewExecutableLocator(logger, "")
 	hookPath := nvidiaCTKDefaultFilePath
-	targets, err := lookup.Locate(nvidiaCTKExecutable)
+	targets, err := lookup.Locate(nvidiaCTKPath)
 	if err != nil {
-		logger.Warnf("Failed to locate %v: %v", nvidiaCTKExecutable, err)
+		logger.Warnf("Failed to locate %v: %v", nvidiaCTKPath, err)
 	} else if len(targets) == 0 {
-		logger.Warnf("%v not found", nvidiaCTKExecutable)
+		logger.Warnf("%v not found", nvidiaCTKPath)
 	} else {
-		logger.Debugf("Found %v candidates: %v", nvidiaCTKExecutable, targets)
+		logger.Debugf("Found %v candidates: %v", nvidiaCTKPath, targets)
 		hookPath = targets[0]
 	}
 	logger.Debugf("Using NVIDIA Container Toolkit CLI path %v", hookPath)

internal/discover/ldconfig.go

@@ -21,7 +21,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/NVIDIA/nvidia-container-toolkit/internal/lookup"
 	"github.com/sirupsen/logrus"
 )
 
@@ -29,9 +28,8 @@ import (
 func NewLDCacheUpdateHook(logger *logrus.Logger, mounts Discover, cfg *Config) (Discover, error) {
 	d := ldconfig{
 		logger:        logger,
+		nvidiaCTKPath: FindNvidiaCTK(logger, cfg.NvidiaCTKPath),
 		mountsFrom:    mounts,
-		lookup:        lookup.NewExecutableLocator(logger, cfg.Root),
-		nvidiaCTKPath: cfg.NvidiaCTKPath,
 	}
 
 	return &d, nil
@@ -40,9 +38,8 @@ func NewLDCacheUpdateHook(logger *logrus.Logger, mounts Discover, cfg *Config) (
 type ldconfig struct {
 	None
 	logger        *logrus.Logger
-	mountsFrom    Discover
-	lookup        lookup.Locator
 	nvidiaCTKPath string
+	mountsFrom    Discover
 }
 
 // Hooks checks the required mounts for libraries and returns a hook to update the LDcache for the discovered paths.

internal/edits/edits.go

@@ -108,7 +108,7 @@ func (e *edits) Modify(spec *ociSpecs.Spec) error {
 	}
 	e.logger.Infof("Hooks:")
 	for _, hook := range e.Hooks {
-		e.logger.Infof("Injecting %v", hook.Args)
+		e.logger.Infof("Injecting %v %v", hook.Path, hook.Args)
 	}
 
 	return e.Apply(spec)

scripts/release-kitmaker-artifactory.sh

@@ -75,9 +75,10 @@ function extract_info() {
 }
 
 IMAGE_EPOCH=$(extract_info "IMAGE_EPOCH")
-GIT_BRANCH=$(extract_info "GIT_BRANCH")
+# Note we use the main branch for the kitmaker archive.
+GIT_BRANCH=main
 GIT_COMMIT=$(extract_info "GIT_COMMIT")
-VERSION=$(extract_info "VERSION")
+VERSION=$(extract_info "PACKAGE_VERSION")
 
 
 # add_distro adds the specified component, os, and arch to the .package folder from which a kitmaker archive is generated.

versions.mk

@@ -14,7 +14,7 @@
 
 LIB_NAME := nvidia-container-toolkit
 LIB_VERSION := 1.12.0
-LIB_TAG := rc.4
+LIB_TAG := rc.5
 
 # Specify the nvidia-docker2 and nvidia-container-runtime package versions.
 # Note: The build tooling uses `LIB_TAG` above as the version tag.