Using container NetworkDisabled to fix #13725

container.config.NetworkDisabled is set for both daemon's
DisableNetwork and --networking=false case. Hence using
this flag instead to fix #13725.

There is an existing integration-test to catch this issue,
but it is working for the wrong reasons.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 83208a531d1824ea7b0a55f9419e915e446c780a
Component: engine
This commit is contained in:
Madhu Venugopal
2015-06-03 17:31:22 -07:00
parent f3c5fa17d3
commit 8b93ea90be
+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,
}