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

Fix bug where ldcache may not contain symlinks

Browse Source 
Since the creation of symlinks may include other libraries / folders
the ldcache should be updated AFTER the symlinks are created.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-07-15 12:18:36 +02:00
parent 02c14e981c
commit 7584044b3c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/modifier/csv.go
View File

@ -84,17 +84,22 @@ func NewCSVModifier(logger *logrus.Logger, cfg *config.Config, ociSpec oci.Spec)
return nil, fmt.Errorf("failed to create CSV discoverer: %v", err) return nil, fmt.Errorf("failed to create CSV discoverer: %v", err)
} }
ldcacheUpdateHook, err := discover.NewLDCacheUpdateHook(logger, csvDiscoverer, config)
if err != nil {
return nil, fmt.Errorf("failed to create ldcach update hook discoverer: %v", err)
}
createSymlinksHook, err := discover.NewCreateSymlinksHook(logger, csvFiles, csvDiscoverer, config) createSymlinksHook, err := discover.NewCreateSymlinksHook(logger, csvFiles, csvDiscoverer, config)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create symlink hook discoverer: %v", err) return nil, fmt.Errorf("failed to create symlink hook discoverer: %v", err)
} }
d := discover.Merge(csvDiscoverer, ldcacheUpdateHook, createSymlinksHook) ldcacheUpdateHook, err := discover.NewLDCacheUpdateHook(logger, csvDiscoverer, config)
if err != nil {
return nil, fmt.Errorf("failed to create ldcach update hook discoverer: %v", err)
}
d := discover.Merge(
csvDiscoverer,
createSymlinksHook,
// The ldcacheUpdateHook is added last to ensure that the created symlinks are included
ldcacheUpdateHook,
)
discoverModifier, err := NewModifierFromDiscoverer(logger, d) discoverModifier, err := NewModifierFromDiscoverer(logger, d)
if err != nil { if err != nil {