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

Allow ldcache update in container to be skipped

Browse Source 
This change skips the update of ld.cache in the container if it
doesn't exist. Instead, the -N flag is used to only create the
relevant symlinks.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2023-10-24 16:35:27 +02:00
parent 5d7ee25b37
commit 6dc9ee3f33
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
# NVIDIA Container Toolkit Changelog # NVIDIA Container Toolkit Changelog
* Skip update of ldcache in containers without ldconfig. The .so.SONAME symlinks are still created.
## v1.14.3 ## v1.14.3
* [toolkit-container] Bump CUDA base image version to 12.2.2. * [toolkit-container] Bump CUDA base image version to 12.2.2.

36
cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go
View File

@ -84,26 +84,40 @@ func (m command) run(c *cli.Context, cfg *config) error {
return fmt.Errorf("failed to determined container root: %v", err) return fmt.Errorf("failed to determined container root: %v", err)
} }
_, err = os.Stat(filepath.Join(containerRoot, "/etc/ld.so.cache"))
if err != nil && os.IsNotExist(err) {
m.logger.Debugf("No ld.so.cache found, skipping update")
return nil
}
err = m.createConfig(containerRoot, cfg.folders.Value())
if err != nil {
return fmt.Errorf("failed to update ld.so.conf: %v", err)
}
args := []string{"/sbin/ldconfig"} args := []string{"/sbin/ldconfig"}
if containerRoot != "" { if containerRoot != "" {
args = append(args, "-r", containerRoot) args = append(args, "-r", containerRoot)
} }
if !root(containerRoot).hasPath("/etc/ld.so.cache") {
m.logger.Debugf("No ld.so.cache found, skipping update")
args = append(args, "-N")
}
folders := cfg.folders.Value()
if root(containerRoot).hasPath("/etc/ld.so.conf.d") {
err = m.createConfig(containerRoot, folders)
if err != nil {
return fmt.Errorf("failed to update ld.so.conf: %v", err)
}
} else {
args = append(args, folders...)
}
//nolint:gosec // TODO: Can we harden this so that there is less risk of command injection //nolint:gosec // TODO: Can we harden this so that there is less risk of command injection
return syscall.Exec(args[0], args, nil) return syscall.Exec(args[0], args, nil)
} }
type root string
func (r root) hasPath(path string) bool {
_, err := os.Stat(filepath.Join(string(r), path))
if err != nil && os.IsNotExist(err) {
return false
}
return true
}
// createConfig creates (or updates) /etc/ld.so.conf.d/nvcr-<RANDOM_STRING>.conf in the container // createConfig creates (or updates) /etc/ld.so.conf.d/nvcr-<RANDOM_STRING>.conf in the container
// to include the required paths. // to include the required paths.
func (m command) createConfig(root string, folders []string) error { func (m command) createConfig(root string, folders []string) error {