vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move shutdown function into libkpod and have server call in to it

Browse source 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-07-20 14:53:40 -04:00
parent 4fe17ee16d
commit 314d55f284
2 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

22
server/server.go
View file

@ -11,6 +11,7 @@ import (
"time"
"github.com/Sirupsen/logrus"
cstorage "github.com/containers/storage"
"github.com/docker/docker/pkg/registrar"
"github.com/docker/docker/pkg/truncindex"
"github.com/kubernetes-incubator/cri-o/libkpod"
@ -480,12 +481,27 @@ func (s *Server) Shutdown() error {
// New creates a new Server with options provided
func New(config *Config) (*Server, error) {
containerServer, err := libkpod.New(config)
store, err := cstorage.GetStore(cstorage.StoreOptions{
RunRoot: config.RunRoot,
GraphRoot: config.Root,
GraphDriverName: config.Storage,
GraphDriverOptions: config.StorageOptions,
})
if err != nil {
return nil, err
}
storageRuntimeService := storage.GetRuntimeService(containerServer.StorageImageServer(), config.PauseImage)
imageService, err := storage.GetImageService(store, config.DefaultTransport, config.InsecureRegistries)
if err != nil {
return nil, err
}
r, err := oci.New(config.Runtime, config.RuntimeUntrustedWorkload, config.DefaultWorkloadTrust, config.Conmon, config.ConmonEnv, config.CgroupManager)
if err != nil {
return nil, err
}
storageRuntimeService := storage.GetRuntimeService(imageService, config.PauseImage)
if err != nil {
return nil, err
}
@ -494,6 +510,8 @@ func New(config *Config) (*Server, error) {
return nil, err
}
containerServer := libkpod.New(r, store, imageService, config.SignaturePolicyPath)
sandboxes := make(map[string]*sandbox.Sandbox)
netPlugin, err := ocicni.InitCNI(config.NetworkDir, config.PluginDir)
if err != nil {