Merge pull request moby#4944 from davhdavh/patch-1

thompson-shaun · web-flow · commit 593aad1ea909 · 2024-05-23T12:03:07.000-04:00
diff --git a/solver/llbsolver/solver.go b/solver/llbsolver/solver.go
@@ -198,7 +198,7 @@ func (s *Solver) recordBuildHistory(ctx context.Context, id string, req frontend
 		}
 
 		ctx, cancel := context.WithCancelCause(context.Background())
-		ctx, _ = context.WithTimeoutCause(ctx, 20*time.Second, errors.WithStack(context.DeadlineExceeded))
+		ctx, _ = context.WithTimeoutCause(ctx, 300*time.Second, errors.WithStack(context.DeadlineExceeded))
 		defer cancel(errors.WithStack(context.Canceled))
 
 		var mu sync.Mutex

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ func (s *Solver) recordBuildHistory(ctx context.Context, id string, req frontend`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`ctx, cancel := context.WithCancelCause(context.Background())`
`201`		`- ctx, _ = context.WithTimeoutCause(ctx, 20*time.Second, errors.WithStack(context.DeadlineExceeded))`
	`201`	`+ ctx, _ = context.WithTimeoutCause(ctx, 300*time.Second, errors.WithStack(context.DeadlineExceeded))`
`202`	`202`	`defer cancel(errors.WithStack(context.Canceled))`
`203`	`203`
`204`	`204`	`var mu sync.Mutex`