From 8ea396ed7f76cc1274ccf6c7d7f54041fec709cd Mon Sep 17 00:00:00 2001 From: Abhinandan Prativadi Date: Wed, 19 Jul 2017 17:14:41 -0700 Subject: [PATCH] Fixing issue with driver opt not passed to drivers Signed-off-by: Abhinandan Prativadi (cherry picked from commit bcb55c62024419a2f8fa7679e1e068cc43425636) Signed-off-by: Abhinandan Prativadi --- components/engine/container/container.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/container/container.go b/components/engine/container/container.go index e89340610c..d5c1e8f40a 100644 --- a/components/engine/container/container.go +++ b/components/engine/container/container.go @@ -702,6 +702,9 @@ func (container *Container) BuildCreateEndpointOptions(n libnetwork.Network, epC for _, alias := range epConfig.Aliases { createOptions = append(createOptions, libnetwork.CreateOptionMyAlias(alias)) } + for k, v := range epConfig.DriverOpts { + createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(options.Generic{k: v})) + } } if container.NetworkSettings.Service != nil { @@ -747,9 +750,6 @@ func (container *Container) BuildCreateEndpointOptions(n libnetwork.Network, epC createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(genericOption)) } - for k, v := range epConfig.DriverOpts { - createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(options.Generic{k: v})) - } }