From 5b02414864e3d73d3f15f40573ea0ca2713ce2cd Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Thu, 10 Sep 2026 15:34:22 +0200
Subject: [PATCH] rm: keep builder removal outside the status timeout

Use the caller context for cleanup so slow container and volume removal can
finish after the builder-status timeout expires.

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 commands/rm.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commands/rm.go b/commands/rm.go
index 3e61704fec3f..0e74f5147253 100644
--- a/commands/rm.go
+++ b/commands/rm.go
@@ -91,7 +91,7 @@ func runRm(ctx context.Context, dockerCli command.Cli, in rmOptions) error {
 					return err
 				}
 
-				err1 := rm(timeoutCtx, nodes, in)
+				err1 := rm(ctx, nodes, in)
 				if err := txn.Remove(b.Name); err != nil {
 					return err
 				}
@@ -200,7 +200,7 @@ func rmAllInactive(ctx context.Context, txn *store.Txn, dockerCli command.Cli, i
 					return nil
 				}
 				if b.Inactive() {
-					rmerr := rm(timeoutCtx, nodes, in)
+					rmerr := rm(ctx, nodes, in)
 					if err := txn.Remove(b.Name); err != nil {
 						return err
 					}