clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 21:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Network Allocation: Proper rollback in case of failure allocation.

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi
2014-10-03 13:46:24 -07:00
parent 88e21c6a75
commit 103a4e0676
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/container.go
+3 -1
View File
@@ -463,10 +463,12 @@ func (container *Container) allocateNetwork() error {
if container.Config.PortSpecs != nil {
if err := migratePortMappings(container.Config, container.hostConfig); err != nil {
eng.Job("release_interface", container.ID).Run()
return err
}
container.Config.PortSpecs = nil
if err := container.WriteHostConfig(); err != nil {
eng.Job("release_interface", container.ID).Run()
return err
}
}
@@ -496,6 +498,7 @@ func (container *Container) allocateNetwork() error {
for port := range portSpecs {
if err := container.allocatePort(eng, port, bindings); err != nil {
eng.Job("release_interface", container.ID).Run()
return err
}
}
@@ -1149,7 +1152,6 @@ func (container *Container) allocatePort(eng *engine.Engine, port nat.Port, bind
return err
}
if err := job.Run(); err != nil {
eng.Job("release_interface", container.ID).Run()
return err
}
b.HostIp = portEnv.Get("HostIP")