Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #18907, pass in correct cwd value for hooks exe #18921

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Fixes #18907, pass in correct cwd value for hooks exe #18921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 20 additions & 2 deletions libpod/container_internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,17 @@ func (c *Container) postDeleteHooks(ctx context.Context) error {
hook := hook
logrus.Debugf("container %s: invoke poststop hook %d, path %s", c.ID(), i, hook.Path)
var stderr, stdout bytes.Buffer
hookErr, err := exec.Run(ctx, &hook, state, &stdout, &stderr, exec.DefaultPostKillTimeout) //nolint:staticcheck
hookErr, err := exec.RunWithOptions(
ctx,
exec.RunOptions{
Hook: &hook,
Dir: c.bundlePath(),
State: state,
Stdout: &stdout,
Stderr: &stderr,
PostKillTimeout: exec.DefaultPostKillTimeout,
},
)
if err != nil {
logrus.Warnf("Container %s: poststop hook %d: %v", c.ID(), i, err)
if hookErr != err {
Expand Down Expand Up @@ -2223,7 +2233,15 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (map[s
}
}

hookErr, err := exec.RuntimeConfigFilter(ctx, allHooks["precreate"], config, exec.DefaultPostKillTimeout) //nolint:staticcheck
hookErr, err := exec.RuntimeConfigFilterWithOptions(
ctx,
exec.RuntimeConfigFilterOptions{
Hooks: allHooks["precreate"],
Dir: c.bundlePath(),
Config: config,
PostKillTimeout: exec.DefaultPostKillTimeout,
},
)
if err != nil {
logrus.Warnf("Container %s: precreate hook: %v", c.ID(), err)
if hookErr != nil && hookErr != err {
Expand Down
11 changes: 11 additions & 0 deletions libpod/container_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"os"
"path/filepath"
"runtime"
"strings"
"testing"

"github.com/containers/storage/pkg/idtools"
Expand Down Expand Up @@ -142,6 +143,7 @@ func TestPostDeleteHooks(t *testing.T) {

statePath := filepath.Join(dir, "state")
copyPath := filepath.Join(dir, "copy")
cwdPath := filepath.Join(dir, "cwd")
c := Container{
runtime: &Runtime{},
config: &ContainerConfig{
Expand Down Expand Up @@ -169,6 +171,10 @@ func TestPostDeleteHooks(t *testing.T) {
Path: hookPath,
Args: []string{"sh", "-c", fmt.Sprintf("cp %s %s", statePath, copyPath)},
},
rspec.Hook{
Path: hookPath,
Args: []string{"sh", "-c", fmt.Sprintf("pwd >%s", cwdPath)},
},
},
},
},
Expand All @@ -188,6 +194,11 @@ func TestPostDeleteHooks(t *testing.T) {
assert.Regexp(t, stateRegexp, string(content))
})
}
content, err := os.ReadFile(cwdPath)
if err != nil {
t.Fatal(err)
}
assert.Equal(t, strings.TrimSuffix(string(content), "\n"), dir)
}

func init() {
Expand Down