From eb932bef8a844a91343894988cb7b7011a1907ea Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 13 Mar 2025 13:23:24 +0200
Subject: [PATCH 1/2] Update nvidia-ctk-installer app name to match binary name
This change updates the nvidia-ctk-installer app name to match the binary name.
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
cmd/nvidia-ctk-installer/main.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/nvidia-ctk-installer/main.go b/cmd/nvidia-ctk-installer/main.go
index 0f2f1eb9..3761ccc2 100644
--- a/cmd/nvidia-ctk-installer/main.go
+++ b/cmd/nvidia-ctk-installer/main.go
@@ -97,7 +97,7 @@ func (a app) build() *cli.App {
}
// Create the top-level CLI
c := cli.NewApp()
- c.Name = "nvidia-toolkit"
+ c.Name = "nvidia-ctk-installer"
c.Usage = "Install the nvidia-container-toolkit for use by a given runtime"
c.UsageText = "[DESTINATION] [-n | --no-daemon] [-r | --runtime] [-u | --runtime-args]"
c.Description = "DESTINATION points to the host path underneath which the nvidia-container-toolkit should be installed.\nIt will be installed at ${DESTINATION}/toolkit"
From 62497870fa318d602b78640619b84c38cae806fc Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 13 Mar 2025 16:15:29 +0200
Subject: [PATCH 2/2] Add version info to nvidia-ctk-installer
Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
cmd/nvidia-ctk-installer/main.go | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/cmd/nvidia-ctk-installer/main.go b/cmd/nvidia-ctk-installer/main.go
index 3761ccc2..b89eb81e 100644
--- a/cmd/nvidia-ctk-installer/main.go
+++ b/cmd/nvidia-ctk-installer/main.go
@@ -13,6 +13,7 @@ import (
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/runtime"
"github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-ctk-installer/container/toolkit"
+ "github.com/NVIDIA/nvidia-container-toolkit/internal/info"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
)
@@ -48,9 +49,6 @@ func (o options) toolkitRoot() string {
return filepath.Join(o.root, toolkitSubDir)
}
-// Version defines the CLI version. This is set at build time using LD FLAGS
-var Version = "development"
-
func main() {
logger := logger.New()
@@ -101,7 +99,7 @@ func (a app) build() *cli.App {
c.Usage = "Install the nvidia-container-toolkit for use by a given runtime"
c.UsageText = "[DESTINATION] [-n | --no-daemon] [-r | --runtime] [-u | --runtime-args]"
c.Description = "DESTINATION points to the host path underneath which the nvidia-container-toolkit should be installed.\nIt will be installed at ${DESTINATION}/toolkit"
- c.Version = Version
+ c.Version = info.GetVersionString()
c.Before = func(ctx *cli.Context) error {
return a.Before(ctx, &options)
}