vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Load runtimes dynamically via go1.8 plugins

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add registration for more subsystems via plugins

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Move content service to separate package

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-02-16 14:45:13 -08:00
parent b7805198b1
commit 3101be93bc
25 changed files with 435 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

17
linux/runtime.go
View file

@ -1,4 +1,4 @@
package linux
package main
import (
"bytes"
@ -24,16 +24,19 @@ const (
)
func init() {
containerd.RegisterRuntime(runtimeName, New)
containerd.Register(runtimeName, &containerd.Registration{
Type: containerd.RuntimePlugin,
Init: New,
})
}
func New(root string) (containerd.Runtime, error) {
if err := os.MkdirAll(root, 0700); err != nil {
func New(ic *containerd.InitContext) (interface{}, error) {
if err := os.MkdirAll(ic.State, 0700); err != nil {
return nil, err
}
c, cancel := context.WithCancel(context.Background())
c, cancel := context.WithCancel(ic.Context)
return &Runtime{
root: root,
root: ic.State,
events: make(chan *containerd.Event, 2048),
eventsContext: c,
eventsCancel: cancel,
@ -110,7 +113,7 @@ func (r *Runtime) Containers() ([]containerd.Container, error) {
if !fi.IsDir() {
continue
}
c, err := r.loadContainer(fi.Name())
c, err := r.loadContainer(filepath.Join(r.root, fi.Name()))
if err != nil {
return nil, err
}