docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17187 from mavenugo/dopts 

Fail the container start if the network has been removed
This commit is contained in:
Jess Frazelle 2015-10-19 17:12:07 -07:00
parent b135f758d7 8755920d0d
commit 48147d287b
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/container_unix.go
View File

@ -894,12 +894,8 @@ 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 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 container.writeHostConfig() return container.writeHostConfig()