UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2025-06-26 18:18:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[no-relnote] Migrate to urfave v3

Browse Source 
Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
This commit is contained in:
Carlos Eduardo Arango Gutierrez
2025-06-25 15:39:37 +02:00
parent ced79e51ed
commit 1676931fe0
151 changed files with 7200 additions and 19290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/nvidia-ctk/runtime/configure/configure.go
View File

@@ -17,10 +17,11 @@
package configure
import (
"context"
"fmt"
"path/filepath"
"github.com/urfave/cli/v2"
"github.com/urfave/cli/v3"
"github.com/NVIDIA/nvidia-container-toolkit/internal/logger"
"github.com/NVIDIA/nvidia-container-toolkit/pkg/config/engine"
@@ -94,11 +95,11 @@ func (m command) build() *cli.Command {
configure := cli.Command{
Name: "configure",
Usage: "Add a runtime to the specified container engine",
Before: func(c *cli.Context) error {
return m.validateFlags(c, &config)
Before: func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
return ctx, m.validateFlags(cmd, &config)
},
Action: func(c *cli.Context) error {
return m.configureWrapper(c, &config)
Action: func(ctx context.Context, cmd *cli.Command) error {
return m.configureWrapper(cmd, &config)
},
}
@@ -176,7 +177,7 @@ func (m command) build() *cli.Command {
return &configure
}
func (m command) validateFlags(c *cli.Context, config *config) error {
func (m command) validateFlags(c *cli.Command, config *config) error {
if config.mode == "oci-hook" {
if !filepath.IsAbs(config.nvidiaRuntime.hookPath) {
return fmt.Errorf("the NVIDIA runtime hook path %q is not an absolute path", config.nvidiaRuntime.hookPath)
@@ -244,7 +245,7 @@ func (m command) validateFlags(c *cli.Context, config *config) error {
}
// configureWrapper updates the specified container engine config to enable the NVIDIA runtime
func (m command) configureWrapper(c *cli.Context, config *config) error {
func (m command) configureWrapper(c *cli.Command, config *config) error {
switch config.mode {
case "oci-hook":
return m.configureOCIHook(c, config)
@@ -255,7 +256,7 @@ func (m command) configureWrapper(c *cli.Context, config *config) error {
}
// configureConfigFile updates the specified container engine config file to enable the NVIDIA runtime.
func (m command) configureConfigFile(c *cli.Context, config *config) error {
func (m command) configureConfigFile(c *cli.Command, config *config) error {
configSource, err := config.resolveConfigSource()
if err != nil {
return err
@@ -350,7 +351,7 @@ func (c *config) getOutputConfigPath() string {
}
// configureOCIHook creates and configures the OCI hook for the NVIDIA runtime
func (m *command) configureOCIHook(c *cli.Context, config *config) error {
func (m *command) configureOCIHook(c *cli.Command, config *config) error {
err := ocihook.CreateHook(config.hookFilePath, config.nvidiaRuntime.hookPath)
if err != nil {
return fmt.Errorf("error creating OCI hook: %v", err)