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

Allow the shim binary to be specified

Browse Source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2017-05-10 15:12:50 -07:00
parent ac5563a809
commit 0457b13043
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
linux/runtime.go
View File

@ -27,23 +27,29 @@ const (
runtimeName = "linux" runtimeName = "linux"
configFilename = "config.json" configFilename = "config.json"
defaultRuntime = "runc" defaultRuntime = "runc"
defaultShim = "containerd-shim"
) )
func init() { func init() {
plugin.Register(runtimeName, &plugin.Registration{ plugin.Register(runtimeName, &plugin.Registration{
Type: plugin.RuntimePlugin, Type: plugin.RuntimePlugin,
Init: New, Init: New,
Config: &Config{}, Config: &Config{
Shim: defaultShim,
Runtime: defaultRuntime,
},
}) })
} }
var _ = (plugin.Runtime)(&Runtime{}) var _ = (plugin.Runtime)(&Runtime{})
type Config struct { type Config struct {
// Shim is a path or name of binary implementing the Shim GRPC API
Shim string `toml:"shim,omitempty"`
// Runtime is a path or name of an OCI runtime used by the shim // Runtime is a path or name of an OCI runtime used by the shim
Runtime string `toml:"runtime"` Runtime string `toml:"runtime,omitempty"`
// NoShim calls runc directly from within the pkg // NoShim calls runc directly from within the pkg
NoShim bool `toml:"no_shim"` NoShim bool `toml:"no_shim,omitempty"`
} }
func New(ic *plugin.InitContext) (interface{}, error) { func New(ic *plugin.InitContext) (interface{}, error) {
@ -52,13 +58,11 @@ func New(ic *plugin.InitContext) (interface{}, error) {
return nil, err return nil, err
} }
cfg := ic.Config.(*Config) cfg := ic.Config.(*Config)
if cfg.Runtime == "" {
cfg.Runtime = defaultRuntime
}
c, cancel := context.WithCancel(ic.Context) c, cancel := context.WithCancel(ic.Context)
r := &Runtime{ r := &Runtime{
root: path, root: path,
remote: !cfg.NoShim, remote: !cfg.NoShim,
shim: cfg.Shim,
runtime: cfg.Runtime, runtime: cfg.Runtime,
events: make(chan *containerd.Event, 2048), events: make(chan *containerd.Event, 2048),
eventsContext: c, eventsContext: c,
@ -72,6 +76,7 @@ func New(ic *plugin.InitContext) (interface{}, error) {
type Runtime struct { type Runtime struct {
root string root string
shim string
runtime string runtime string
remote bool remote bool
@ -86,7 +91,7 @@ func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts)
if err != nil { if err != nil {
return nil, err return nil, err
} }
s, err := newShim(path, r.remote) s, err := newShim(r.shim, path, r.remote)
if err != nil { if err != nil {
os.RemoveAll(path) os.RemoveAll(path)
return nil, err return nil, err

4
linux/shim.go
View File

@ -22,7 +22,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
func newShim(path string, remote bool) (shim.ShimClient, error) { func newShim(shimName string, path string, remote bool) (shim.ShimClient, error) {
if !remote { if !remote {
return localShim.Client(path) return localShim.Client(path)
} }
@ -31,7 +31,7 @@ func newShim(path string, remote bool) (shim.ShimClient, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
cmd := exec.Command("containerd-shim") cmd := exec.Command(shimName)
cmd.Dir = path cmd.Dir = path
f, err := l.(*net.UnixListener).File() f, err := l.(*net.UnixListener).File()
if err != nil { if err != nil {