|
@@ -569,7 +569,7 @@ func NewDaemon(config *Config, registryService registry.Service, containerdRemot
|
|
// Plugin system initialization should happen before restore. Do not change order.
|
|
// Plugin system initialization should happen before restore. Do not change order.
|
|
d.pluginManager, err = plugin.NewManager(plugin.ManagerConfig{
|
|
d.pluginManager, err = plugin.NewManager(plugin.ManagerConfig{
|
|
Root: filepath.Join(config.Root, "plugins"),
|
|
Root: filepath.Join(config.Root, "plugins"),
|
|
- ExecRoot: "/run/docker/plugins", // possibly needs fixing
|
|
|
|
|
|
+ ExecRoot: getPluginExecRoot(config.Root),
|
|
Store: d.PluginStore,
|
|
Store: d.PluginStore,
|
|
Executor: containerdRemote,
|
|
Executor: containerdRemote,
|
|
RegistryService: registryService,
|
|
RegistryService: registryService,
|