瀏覽代碼

Merge pull request #13732 from mavenugo/netdisabled

Using container NetworkDisabled to fix #13725
Arnaud Porterie 10 年之前
父節點
當前提交
57bba29f79
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      daemon/container_linux.go

+ 1 - 1
daemon/container_linux.go

@@ -183,7 +183,7 @@ func getDevicesFromPath(deviceMapping runconfig.DeviceMapping) (devs []*configs.
 
 
 func populateCommand(c *Container, env []string) error {
 func populateCommand(c *Container, env []string) error {
 	var en *execdriver.Network
 	var en *execdriver.Network
-	if !c.daemon.config.DisableNetwork {
+	if !c.Config.NetworkDisabled {
 		en = &execdriver.Network{
 		en = &execdriver.Network{
 			NamespacePath: c.NetworkSettings.SandboxKey,
 			NamespacePath: c.NetworkSettings.SandboxKey,
 		}
 		}