Pass cwd for hooks exec run function

Signed-off-by: Fang-Pen Lin <[email protected]>
containers · Jun 16, 2023 · 3289545 · 3289545
1 parent bc5ac09
commit 3289545
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/run_linux.go b/run_linux.go
@@ -322,7 +322,7 @@ rootless=%d
  }
 
  // Setup OCI hooks
- _, err = b.setupOCIHooks(spec, (len(options.Mounts) > 0 || len(volumes) > 0))
+ _, err = b.setupOCIHooks(spec, path, (len(options.Mounts) > 0 || len(volumes) > 0))
  if err != nil {
  return fmt.Errorf("unable to setup OCI hooks: %w", err)
  }
@@ -383,7 +383,7 @@ rootless=%d
  return err
 }
 
-func (b *Builder) setupOCIHooks(config *spec.Spec, hasVolumes bool) (map[string][]spec.Hook, error) {
+func (b *Builder) setupOCIHooks(config *spec.Spec, bundlePath string, hasVolumes bool) (map[string][]spec.Hook, error) {
  allHooks := make(map[string][]spec.Hook)
  if len(b.CommonBuildOpts.OCIHooksDir) == 0 {
  if unshare.IsRootless() {
@@ -420,7 +420,7 @@ func (b *Builder) setupOCIHooks(config *spec.Spec, hasVolumes bool) (map[string]
  }
  }
 
- hookErr, err := hooksExec.RuntimeConfigFilter(context.Background(), allHooks["precreate"], config, hooksExec.DefaultPostKillTimeout)
+ hookErr, err := hooksExec.RuntimeConfigFilter(context.Background(), allHooks["precreate"], bundlePath, config, hooksExec.DefaultPostKillTimeout)
  if err != nil {
  logrus.Warnf("Container: precreate hook: %v", err)
  if hookErr != nil && hookErr != err {