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

add basic config struct to libkpod

Browse source 
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-07-25 15:16:43 -04:00
parent f8a822e900
commit 0c8f106ee8
8 changed files with 351 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

11
server/server.go
View file

@ -471,11 +471,6 @@ func New(config *Config) (*Server, error) {
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
@ -484,8 +479,10 @@ func New(config *Config) (*Server, error) {
if err := os.MkdirAll("/var/run/crio", 0755); err != nil {
return nil, err
}
containerServer := libkpod.New(r, store, imageService, config.SignaturePolicyPath)
containerServer, err := libkpod.New(&config.Config)
if err != nil {
return nil, err
}
netPlugin, err := ocicni.InitCNI(config.NetworkDir, config.PluginDir)
if err != nil {