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
commit 48147d287b
1 changed files with 1 additions and 5 deletions

View File

@ -894,11 +894,7 @@ func (container *Container) allocateNetwork() error {
for _, n := range settings {
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
}
}