Merge pull request #13390 from mrjana/cnm_integ

Do not attempt releasing network when not attached to any network
This commit is contained in:
Brian Goff 2015-06-01 08:25:20 -07:00
commit b445004364
1 changed files with 6 additions and 0 deletions

View File

@ -903,6 +903,12 @@ func (container *Container) ReleaseNetwork() {
return
}
// If the container is not attached to any network do not try
// to release network and generate spurious error messages.
if container.NetworkSettings.NetworkID == "" {
return
}
n, err := container.daemon.netController.NetworkByID(container.NetworkSettings.NetworkID)
if err != nil {
logrus.Errorf("error locating network id %s: %v", container.NetworkSettings.NetworkID, err)