Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 6f00601c9fb7886547334f80a250bac5e226aad7)
Signed-off-by: Victor Vieux <vieux@docker.com>
| ... | ... |
@@ -134,9 +134,9 @@ func (p *Plugin) InitPlugin() error {
|
| 134 | 134 |
|
| 135 | 135 |
p.PluginObj.Settings.Mounts = make([]types.PluginMount, len(p.PluginObj.Config.Mounts)) |
| 136 | 136 |
copy(p.PluginObj.Settings.Mounts, p.PluginObj.Config.Mounts) |
| 137 |
- p.PluginObj.Settings.Env = make([]string, 0, len(p.PluginObj.Config.Env)) |
|
| 138 |
- p.PluginObj.Settings.Devices = make([]types.PluginDevice, 0, len(p.PluginObj.Config.Linux.Devices)) |
|
| 137 |
+ p.PluginObj.Settings.Devices = make([]types.PluginDevice, len(p.PluginObj.Config.Linux.Devices)) |
|
| 139 | 138 |
copy(p.PluginObj.Settings.Devices, p.PluginObj.Config.Linux.Devices) |
| 139 |
+ p.PluginObj.Settings.Env = make([]string, 0, len(p.PluginObj.Config.Env)) |
|
| 140 | 140 |
for _, env := range p.PluginObj.Config.Env {
|
| 141 | 141 |
if env.Value != nil {
|
| 142 | 142 |
p.PluginObj.Settings.Env = append(p.PluginObj.Settings.Env, fmt.Sprintf("%s=%s", env.Name, *env.Value))
|