UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 16:29:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use base filename as first hook argument

Browse Source 
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-09-29 12:14:12 +02:00
parent 8c1b9b33c1
commit 4dedac6a24
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/discover/ldconfig.go
View File

@ -80,7 +80,7 @@ func CreateLDCacheUpdateHook(logger *logrus.Logger, lookup lookup.Locator, execu
} }
logger.Debugf("Using NVIDIA Container Toolkit CLI path %v", hookPath) logger.Debugf("Using NVIDIA Container Toolkit CLI path %v", hookPath)
args := []string{hookPath, "hook", "update-ldcache"} args := []string{filepath.Base(hookPath), "hook", "update-ldcache"}
for _, f := range uniqueFolders(libraries) { for _, f := range uniqueFolders(libraries) {
args = append(args, "--folder", f) args = append(args, "--folder", f)
} }

6
internal/discover/ldconfig_test.go
View File

@ -41,7 +41,7 @@ func TestLDCacheUpdateHook(t *testing.T) {
}{ }{
{ {
description: "empty mounts", description: "empty mounts",
expectedArgs: []string{"/usr/bin/nvidia-ctk", "hook", "update-ldcache"}, expectedArgs: []string{"nvidia-ctk", "hook", "update-ldcache"},
}, },
{ {
description: "mount error", description: "mount error",
@ -64,7 +64,7 @@ func TestLDCacheUpdateHook(t *testing.T) {
Path: "/usr/local/lib/libbar.so", Path: "/usr/local/lib/libbar.so",
}, },
}, },
expectedArgs: []string{"/usr/bin/nvidia-ctk", "hook", "update-ldcache", "--folder", "/usr/local/lib", "--folder", "/usr/local/libother"}, expectedArgs: []string{"nvidia-ctk", "hook", "update-ldcache", "--folder", "/usr/local/lib", "--folder", "/usr/local/libother"},
}, },
{ {
description: "host paths are ignored", description: "host paths are ignored",
@ -74,7 +74,7 @@ func TestLDCacheUpdateHook(t *testing.T) {
Path: "/usr/local/lib/libfoo.so", Path: "/usr/local/lib/libfoo.so",
}, },
}, },
expectedArgs: []string{"/usr/bin/nvidia-ctk", "hook", "update-ldcache", "--folder", "/usr/local/lib"}, expectedArgs: []string{"nvidia-ctk", "hook", "update-ldcache", "--folder", "/usr/local/lib"},
}, },
} }