Merge branch 'main' into issue_#1283

internal/build/lifecycle_execution.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"time"
 
 	"github.com/BurntSushi/toml"
 	"github.com/buildpacks/lifecycle/api"
@@ -164,6 +165,8 @@ func (l *LifecycleExecution) PrevImageName() string {
 	return l.opts.PreviousImage
 }
 
+const maxNetworkRemoveRetries = 2
+
 func (l *LifecycleExecution) Run(ctx context.Context, phaseFactoryCreator PhaseFactoryCreator) error {
 	phaseFactory := phaseFactoryCreator(l)
 
@@ -211,15 +214,21 @@ func (l *LifecycleExecution) Run(ctx context.Context, phaseFactoryCreator PhaseF
 		if l.os == "windows" {
 			driver = "nat"
 		}
-		networkName := fmt.Sprintf("pack.local/network/%x", randString(10))
+		networkName := fmt.Sprintf("pack.local-network-%x", randString(10))
 		resp, err := l.docker.NetworkCreate(ctx, networkName, types.NetworkCreate{
 			Driver: driver,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to create ephemeral %s network: %w", driver, err)
 		}
 		defer func() {
-			_ = l.docker.NetworkRemove(ctx, networkName)
+			for i := 0; i <= maxNetworkRemoveRetries; i++ {
+				time.Sleep(100 * time.Duration(i) * time.Millisecond) // wait if retrying
+				if err = l.docker.NetworkRemove(ctx, networkName); err != nil {
+					continue
+				}
+				break
+			}
 		}()
 		l.logger.Debugf("Created ephemeral bridge network %s with ID %s", networkName, resp.ID)
 		if resp.Warning != "" {

internal/build/lifecycle_execution_test.go

@@ -804,7 +804,7 @@ func testLifecycleExecution(t *testing.T, when spec.G, it spec.S) {
 				h.AssertNil(t, err)
 
 				for _, entry := range fakePhaseFactory.NewCalledWithProvider {
-					h.AssertContains(t, string(entry.HostConfig().NetworkMode), "pack.local/network/")
+					h.AssertContains(t, string(entry.HostConfig().NetworkMode), "pack.local-network-")
 					h.AssertEq(t, entry.HostConfig().NetworkMode.IsDefault(), false)
 					h.AssertEq(t, entry.HostConfig().NetworkMode.IsHost(), false)
 					h.AssertEq(t, entry.HostConfig().NetworkMode.IsNone(), false)