diff --git a/libcontainer/container_linux.go b/libcontainer/container_linux.go index af9172a89a4..c0d92601a08 100644 --- a/libcontainer/container_linux.go +++ b/libcontainer/container_linux.go @@ -237,7 +237,11 @@ func (c *Container) exec() error { for { select { case result := <-blockingFifoOpenCh: - return handleFifoResult(result) + err := handleFifoResult(result) + if err != nil { + return err + } + return c.postStart() case <-time.After(time.Millisecond * 100): stat, err := system.Stat(pid) @@ -247,12 +251,26 @@ func (c *Container) exec() error { if err := handleFifoResult(fifoOpen(path, false)); err != nil { return errors.New("container process is already dead") } - return nil + return c.postStart() } } } } +func (c *Container) postStart() error { + if c.config.HasHook(configs.Poststart) { + s, err := c.currentOCIState() + if err != nil { + return err + } + if err := c.config.Hooks.Run(configs.Poststart, s); err != nil { + logrus.Errorf("run poststart hook: %v", err) + return fmt.Errorf("run poststart hook: %w", err) + } + } + return nil +} + func readFromExecFifo(execFifo io.Reader) error { data, err := io.ReadAll(execFifo) if err != nil { @@ -371,19 +389,6 @@ func (c *Container) start(process *Process) (retErr error) { if process.Init { c.fifo.Close() - if c.config.HasHook(configs.Poststart) { - s, err := c.currentOCIState() - if err != nil { - return err - } - - if err := c.config.Hooks.Run(configs.Poststart, s); err != nil { - if err := ignoreTerminateErrors(parent.terminate()); err != nil { - logrus.Warn(fmt.Errorf("error running poststart hook: %w", err)) - } - return err - } - } } return nil }