Merge component 'engine' from git@github.com:docker/engine 19.03

GordonTheTurtle · GordonTheTurtle · commit 81dab2018b84 · 2020-07-26T09:29:13.000Z
diff --git a/components/engine/daemon/container_operations.go b/components/engine/daemon/container_operations.go
@@ -509,7 +509,7 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai
 	}
 }
 
-func (daemon *Daemon) allocateNetwork(container *container.Container) error {
+func (daemon *Daemon) allocateNetwork(container *container.Container) (retErr error) {
 	start := time.Now()
 	controller := daemon.netController
 
@@ -577,7 +577,7 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) error {
 			}
 			updateSandboxNetworkSettings(container, sb)
 			defer func() {
-				if err != nil {
+				if retErr != nil {
 					sb.Delete()
 				}
 			}()

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ func (daemon Daemon) updateContainerNetworkSettings(container container.Contai`
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`
`512`		`-func (daemon Daemon) allocateNetwork(container container.Container) error {`
	`512`	`+func (daemon Daemon) allocateNetwork(container container.Container) (retErr error) {`
`513`	`513`	`start := time.Now()`
`514`	`514`	`controller := daemon.netController`
`515`	`515`
`@@ -577,7 +577,7 @@ func (daemon Daemon) allocateNetwork(container container.Container) error {`
`577`	`577`	`}`
`578`	`578`	`updateSandboxNetworkSettings(container, sb)`
`579`	`579`	`defer func() {`
`580`		`- if err != nil {`
	`580`	`+ if retErr != nil {`
`581`	`581`	`sb.Delete()`
`582`	`582`	`}`
`583`	`583`	`}()`