buildNetworkRelatedPath in netns network mode

Signed-off-by: zhuangqh <zhuangqhc@gmail.com>
AliyunContainerService · May 13, 2019 · 602298d · 602298d
1 parent b0d932d
commit 602298d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/daemon/mgr/container.go b/daemon/mgr/container.go
@@ -685,11 +685,6 @@ func (mgr *ContainerManager) prepareContainerNetwork(ctx context.Context, c *Con
  return nil
  }
 
- // network is prepared by upper system. do nothing here.
- if IsNetNS(networkMode) {
- return nil
- }
-
  // initialise host network mode
  if IsHost(networkMode) {
  hostname, err := os.Hostname()
@@ -704,6 +699,11 @@ func (mgr *ContainerManager) prepareContainerNetwork(ctx context.Context, c *Con
  return err
  }
 
+ // network is prepared by upper system. do nothing here.
+ if IsNetNS(networkMode) {
+ return nil
+ }
+
  // initialise network endpoint
  if c.NetworkSettings == nil {
  return nil