Merge pull request containerd#3155 from crosbymichael/plugins

dmcgowan · web-flow · commit bc8a1895e3eb · 2019-04-01T15:22:51.000-07:00
Add configurable plugin path
diff --git a/services/server/config/config.go b/services/server/config/config.go
@@ -28,6 +28,8 @@ type Config struct {
 	Root string `toml:"root"`
 	// State is the path to a directory where containerd will store transient data
 	State string `toml:"state"`
+	// PluginDir is the directory for dynamic plugins to be stored
+	PluginDir string `toml:"plugin_dir"`
 	// GRPC configuration settings
 	GRPC GRPCConfig `toml:"grpc"`
 	// Debug and profiling settings
diff --git a/services/server/server.go b/services/server/server.go
@@ -220,7 +220,11 @@ func (s *Server) Stop() {
 // of all plugins.
 func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]*plugin.Registration, error) {
 	// load all plugins into containerd
-	if err := plugin.Load(filepath.Join(config.Root, "plugins")); err != nil {
+	path := config.PluginDir
+	if path == "" {
+		path = filepath.Join(config.Root, "plugins")
+	}
+	if err := plugin.Load(path); err != nil {
 		return nil, err
 	}
 	// load additional plugins that don't automatically register themselves
