Merge pull request #13732 from mavenugo/netdisabled

Using container NetworkDisabled to fix #13725
Upstream-commit: 57bba29f7910e0fe7d99ecb6375d7c56fd1812bf
Component: engine
This commit is contained in:
Arnaud Porterie
2015-06-03 21:40:15 -07:00
+1 -1
View File
@@ -183,7 +183,7 @@ func getDevicesFromPath(deviceMapping runconfig.DeviceMapping) (devs []*configs.
func populateCommand(c *Container, env []string) error {
var en *execdriver.Network
if !c.daemon.config.DisableNetwork {
if !c.Config.NetworkDisabled {
en = &execdriver.Network{
NamespacePath: c.NetworkSettings.SandboxKey,
}