github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #2838 from thaJeztah/update_runc_1.0-rc6

Browse Source 
Update runc to v1.0.0-rc6
This commit is contained in:
Phil Estes
2018-11-28 10:55:50 +00:00
committed by GitHub
parent dcb82064d3 97dd5df66f
commit 3ef95e0ff3
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -20,7 +20,7 @@ github.com/gogo/protobuf v1.0.0
github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef
github.com/golang/protobuf v1.1.0 github.com/golang/protobuf v1.1.0
github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353 # v1.0.1-45-geba862d github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353 # v1.0.1-45-geba862d
github.com/opencontainers/runc 10d38b660a77168360df3522881e2dc2be5056bd github.com/opencontainers/runc v1.0.0-rc6
github.com/sirupsen/logrus v1.0.3 github.com/sirupsen/logrus v1.0.3
github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
golang.org/x/net b3756b4b77d7b13260a0a2ec658753cf48922eac golang.org/x/net b3756b4b77d7b13260a0a2ec658753cf48922eac

13
vendor/github.com/opencontainers/runc/libcontainer/configs/config.go generated vendored
View File

@@ -272,26 +272,23 @@ func (hooks Hooks) MarshalJSON() ([]byte, error) {
}) })
} }
// HookState is the payload provided to a hook on execution.
type HookState specs.State
type Hook interface { type Hook interface {
// Run executes the hook with the provided state. // Run executes the hook with the provided state.
Run(HookState) error Run(*specs.State) error
} }
// NewFunctionHook will call the provided function when the hook is run. // NewFunctionHook will call the provided function when the hook is run.
func NewFunctionHook(f func(HookState) error) FuncHook { func NewFunctionHook(f func(*specs.State) error) FuncHook {
return FuncHook{ return FuncHook{
run: f, run: f,
} }
} }
type FuncHook struct { type FuncHook struct {
run func(HookState) error run func(*specs.State) error
} }
func (f FuncHook) Run(s HookState) error { func (f FuncHook) Run(s *specs.State) error {
return f.run(s) return f.run(s)
} }
@@ -314,7 +311,7 @@ type CommandHook struct {
Command Command
} }
func (c Command) Run(s HookState) error { func (c Command) Run(s *specs.State) error {
b, err := json.Marshal(s) b, err := json.Marshal(s)
if err != nil { if err != nil {
return err return err