Merge branch 'main' into dependabot/go_modules/github.com/containerd/…

…containerd-1.6.16
testcontainers · Jan 30, 2023 · ea04ab5 · ea04ab5
2 parents 0622480 + 898a14d
commit ea04ab5
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 295 deletions.
diff --git a/docker.go b/docker.go
@@ -894,7 +894,18 @@ func (p *DockerProvider) BuildImage(ctx context.Context, img ImageBuildInfo) (st
 		ForceRemove: true,
 	}
 
-	resp, err := p.client.ImageBuild(ctx, buildContext, buildOptions)
+	var resp types.ImageBuildResponse
+	err = backoff.Retry(func() error {
+		resp, err = p.client.ImageBuild(ctx, buildContext, buildOptions)
+		if err != nil {
+			if _, ok := err.(errdefs.ErrNotFound); ok {
+				return backoff.Permanent(err)
+			}
+			Logger.Printf("Failed to build image: %s, will retry", err)
+			return err
+		}
+		return nil
+	}, backoff.WithContext(backoff.NewExponentialBackOff(), ctx))
 	if err != nil {
 		return "", err
 	}