Skip to content

Commit

Permalink
Implement hooks in libcontainer
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
  • Loading branch information
crosbymichael committed Sep 11, 2015
1 parent cd01b01 commit 05567f2
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 7 deletions.
73 changes: 73 additions & 0 deletions libcontainer/configs/config.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
package configs

import (
"bytes"
"encoding/json"
"os/exec"
)

type Rlimit struct {
Type int `json:"type"`
Hard uint64 `json:"hard"`
Expand Down Expand Up @@ -159,4 +165,71 @@ type Config struct {
// A number of rules are given, each having an action to be taken if a syscall matches it.
// A default action to be taken if no rules match is also given.
Seccomp *Seccomp `json:"seccomp"`

// Hooks are a collection of actions to perform at various container lifecycle events.
// Hooks are not able to be marshaled to json but they are also not needed to.
Hooks *Hooks `json:"-"`
}

type Hooks struct {
// Prestart commands are executed after the container namespaces are created,
// but before the user supplied command is executed from init.
Prestart []Hook

// PostStop commands are executed after the container init process exits.
Poststop []Hook
}

// HookState is the payload provided to a hook on execution.
type HookState struct {
ID string `json:"id"`
Pid int `json:"pid"`
}

type Hook interface {
// Run executes the hook with the provided state.
Run(*HookState) error
}

// NewFunctionHooks will call the provided function when the hook is run.
func NewFunctionHook(f func(*HookState) error) *FuncHook {
return &FuncHook{
Run: f,
}
}

type FuncHook struct {
Run func(*HookState) error
}

type Command struct {
Path string `json:"path"`
Args []string `json:"args"`
Env []string `json:"env"`
Dir string `json:"dir"`
}

// NewCommandHooks will execute the provided command when the hook is run.
func NewCommandHook(cmd Command) *CommandHook {
return &CommandHook{
Command: cmd,
}
}

type CommandHook struct {
Command
}

func (c *Command) Run(s *HookState) error {
b, err := json.Marshal(s)
if err != nil {
return err
}
cmd := exec.Cmd{
Path: c.Path,
Args: c.Args,
Env: c.Env,
Stdin: bytes.NewReader(b),
}
return cmd.Run()
}
7 changes: 0 additions & 7 deletions libcontainer/configs/mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,3 @@ type Mount struct {
// Optional Command to be run after Source is mounted.
PostmountCmds []Command `json:"postmount_cmds"`
}

type Command struct {
Path string `json:"path"`
Args []string `json:"args"`
Env []string `json:"env"`
Dir string `json:"dir"`
}
10 changes: 10 additions & 0 deletions libcontainer/container_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,16 @@ func (c *linuxContainer) Destroy() error {
err = rerr
}
c.initProcess = nil
if c.config.Hooks != nil {
s := configs.HookState{
ID: c.id,
}
for _, hook := range c.config.Hooks.Poststop {
if err := hook.Run(&s); err != nil {
return err
}
}
}
return err
}

Expand Down
12 changes: 12 additions & 0 deletions libcontainer/process_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"syscall"

"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/system"
)

Expand Down Expand Up @@ -200,6 +201,17 @@ func (p *initProcess) start() (err error) {
p.manager.Destroy()
}
}()
if p.config.Config.Hooks != nil {
s := configs.HookState{
ID: p.container.id,
Pid: p.pid(),
}
for _, hook := range p.config.Config.Hooks.Prestart {
if err := hook.Run(&s); err != nil {
return newSystemError(err)
}
}
}
if err := p.createNetworkInterfaces(); err != nil {
return newSystemError(err)
}
Expand Down

0 comments on commit 05567f2

Please sign in to comment.