mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2025-04-10 07:15:40 +00:00
Fix bug where ldcache may not contain symlinks
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:
parent
02c14e981c
commit
7584044b3c
@ -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)
|
||||
}
|
||||
|
||||
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)
|
||||
if err != nil {
|
||||
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)
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user