Revert "Update runc to 1.0.0"
This commit is contained in:
10
vendor/github.com/opencontainers/runc/libcontainer/configs/config.go
generated
vendored
10
vendor/github.com/opencontainers/runc/libcontainer/configs/config.go
generated
vendored
@@ -208,11 +208,9 @@ type Config struct {
|
||||
RootlessCgroups bool `json:"rootless_cgroups,omitempty"`
|
||||
}
|
||||
|
||||
type (
|
||||
HookName string
|
||||
HookList []Hook
|
||||
Hooks map[HookName]HookList
|
||||
)
|
||||
type HookName string
|
||||
type HookList []Hook
|
||||
type Hooks map[HookName]HookList
|
||||
|
||||
const (
|
||||
// Prestart commands are executed after the container namespaces are created,
|
||||
@@ -389,7 +387,7 @@ func (c Command) Run(s *specs.State) error {
|
||||
case err := <-errC:
|
||||
return err
|
||||
case <-timerCh:
|
||||
_ = cmd.Process.Kill()
|
||||
cmd.Process.Kill()
|
||||
<-errC
|
||||
return fmt.Errorf("hook ran past specified timeout of %.1fs", c.Timeout.Seconds())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user