From 6f00601c9fb7886547334f80a250bac5e226aad7 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 15 Dec 2016 15:35:53 -0800 Subject: [PATCH] fix devices in plugins Signed-off-by: Victor Vieux --- plugin/v2/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/v2/plugin.go b/plugin/v2/plugin.go index 553dfd875c..e3f9e9814e 100644 --- a/plugin/v2/plugin.go +++ b/plugin/v2/plugin.go @@ -134,9 +134,9 @@ func (p *Plugin) InitPlugin() error { p.PluginObj.Settings.Mounts = make([]types.PluginMount, len(p.PluginObj.Config.Mounts)) copy(p.PluginObj.Settings.Mounts, p.PluginObj.Config.Mounts) - p.PluginObj.Settings.Env = make([]string, 0, len(p.PluginObj.Config.Env)) - p.PluginObj.Settings.Devices = make([]types.PluginDevice, 0, len(p.PluginObj.Config.Linux.Devices)) + p.PluginObj.Settings.Devices = make([]types.PluginDevice, len(p.PluginObj.Config.Linux.Devices)) copy(p.PluginObj.Settings.Devices, p.PluginObj.Config.Linux.Devices) + p.PluginObj.Settings.Env = make([]string, 0, len(p.PluginObj.Config.Env)) for _, env := range p.PluginObj.Config.Env { if env.Value != nil { p.PluginObj.Settings.Env = append(p.PluginObj.Settings.Env, fmt.Sprintf("%s=%s", env.Name, *env.Value))