From 8e6084c661adb34fd73dbcab3f48b11274e00ba2 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 22 Apr 2026 21:04:40 +0200
Subject: [PATCH] Set default of WOODPECKER_BACKEND_{DOCKER,K8S}_STOP_TIMEOUT
 to 20s (#6475)

---
 pipeline/backend/docker/flags.go     | 2 +-
 pipeline/backend/kubernetes/flags.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipeline/backend/docker/flags.go b/pipeline/backend/docker/flags.go
index d91ed8ee4..a9534f1aa 100644
--- a/pipeline/backend/docker/flags.go
+++ b/pipeline/backend/docker/flags.go
@@ -60,7 +60,7 @@ var Flags = []cli.Flag{
 		Sources: cli.EnvVars("WOODPECKER_BACKEND_DOCKER_STOP_TIMEOUT"),
 		Name:    "backend-docker-stop-timeout",
 		Usage:   "seconds Woodpecker waits for a container to stop gracefully before forcefully killing it",
-		Value:   180, //nolint:mnd
+		Value:   20, //nolint:mnd
 	},
 	//
 	// resource limit parameters
diff --git a/pipeline/backend/kubernetes/flags.go b/pipeline/backend/kubernetes/flags.go
index 0cf5f320c..f34cb6538 100644
--- a/pipeline/backend/kubernetes/flags.go
+++ b/pipeline/backend/kubernetes/flags.go
@@ -132,6 +132,6 @@ var Flags = []cli.Flag{
 		Sources: cli.EnvVars("WOODPECKER_BACKEND_K8S_STOP_TIMEOUT"),
 		Name:    "backend-k8s-stop-timeout",
 		Usage:   "seconds Woodpecker waits for pods to stop gracefully before forcefully killing them",
-		Value:   180,
+		Value:   20,
 	},
 }