浏览代码

Merge pull request #17187 from mavenugo/dopts

Fail the container start if the network has been removed
Jess Frazelle 9 年之前
父节点
当前提交
48147d287b
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      daemon/container_unix.go

+ 1 - 5
daemon/container_unix.go

@@ -894,11 +894,7 @@ func (container *Container) allocateNetwork() error {
 
 
 	for _, n := range settings {
 	for _, n := range settings {
 		if err := container.connectToNetwork(n, updateSettings); err != nil {
 		if err := container.connectToNetwork(n, updateSettings); err != nil {
-			if updateSettings {
-				return err
-			}
-			// dont fail a container restart case if the user removed the network
-			logrus.Warnf("Could not connect container %s : %v", container.ID, err)
+			return err
 		}
 		}
 	}
 	}