Merge pull request from cyphar/respect-plugindir-config

server: respect ocid.network.plugin_dir setting
This commit is contained in:
Mrunal Patel 2017-01-24 10:54:38 -08:00 committed by GitHub
commit 7fda27a5b3

View file

@ -476,7 +476,7 @@ func New(config *Config) (*Server, error) {
}
sandboxes := make(map[string]*sandbox)
containers := oci.NewMemoryStore()
netPlugin, err := ocicni.InitCNI(config.NetworkDir)
netPlugin, err := ocicni.InitCNI(config.NetworkDir, config.PluginDir)
if err != nil {
return nil, err
}