From 6f12e416d2ffb5140261fd85e14bb7464187dd82 Mon Sep 17 00:00:00 2001
From: "Philip K. Warren" <pkwarren@users.noreply.github.com>
Date: Tue, 1 Sep 2026 18:15:29 -0500
Subject: [PATCH] Extend docker rm timeout from default 20s

Update to use a 5m timeout instead of the default 20s. Under load we're
seeing context cancellation and failures removing the builder.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2fd3f2e19..19dbd8523 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ else
 	docker buildx inspect "$(DOCKER_BUILDER)" 2> /dev/null || docker buildx create --use --bootstrap --name="$(DOCKER_BUILDER)" > /dev/null
 	$(GO) run ./internal/cmd/dockerbuild -cache-dir "$(DOCKER_CACHE_DIR)" -org "$(DOCKER_ORG)" -- $(DOCKER_BUILD_EXTRA_ARGS) || \
 		(docker buildx rm "$(DOCKER_BUILDER)"; exit 1)
-	docker buildx rm "$(DOCKER_BUILDER)" > /dev/null
+	docker buildx rm --timeout 5m "$(DOCKER_BUILDER)" > /dev/null
 endif
 
 .PHONY: lint