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

Merge pull request #846 from crosbymichael/linux-container

Browse Source 
Move container and runtime to plugin pkg
This commit is contained in:
Daniel, Dao Quang Minh
2017-05-11 19:07:58 -05:00
committed by GitHub
parent e4945164b0 5a2ad6393f
commit 6df793797e
16 changed files with 100 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/containerd/main.go
View File

@@ -265,8 +265,8 @@ func resolveMetaDB(ctx *cli.Context) (*bolt.DB, error) {
return db, nil
}
func loadRuntimes(monitor plugin.ContainerMonitor) (map[string]containerd.Runtime, error) {
o := make(map[string]containerd.Runtime)
func loadRuntimes(monitor plugin.ContainerMonitor) (map[string]plugin.Runtime, error) {
o := make(map[string]plugin.Runtime)
for name, rr := range plugin.Registrations() {
if rr.Type != plugin.RuntimePlugin {
continue
@@ -288,7 +288,7 @@ func loadRuntimes(monitor plugin.ContainerMonitor) (map[string]containerd.Runtim
if err != nil {
return nil, err
}
o[name] = vr.(containerd.Runtime)
o[name] = vr.(plugin.Runtime)
}
return o, nil
}
@@ -358,7 +358,7 @@ func newGRPCServer() *grpc.Server {
return s
}
func loadServices(runtimes map[string]containerd.Runtime, store content.Store, sn snapshot.Snapshotter, meta *bolt.DB) ([]plugin.Service, error) {
func loadServices(runtimes map[string]plugin.Runtime, store content.Store, sn snapshot.Snapshotter, meta *bolt.DB) ([]plugin.Service, error) {
var o []plugin.Service
for name, sr := range plugin.Registrations() {
if sr.Type != plugin.GRPCPlugin {