From 28505a7ed472d480150816c1f80481bca268f8f0 Mon Sep 17 00:00:00 2001
From: Sean <sean0407@users.noreply.github.com>
Date: Sun, 11 Oct 2026 15:50:54 +0800
Subject: [PATCH 1/2] fix: forward forced cleanup flag (#9127)

---
 plugins/common/functions                  |  2 +-
 tests/unit/docker-cleanup-force-flag.bats | 27 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tests/unit/docker-cleanup-force-flag.bats

diff --git a/plugins/common/functions b/plugins/common/functions
index bb00b5016..29a1c54dd 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -789,7 +789,7 @@ docker_cleanup() {
   declare APP="$1" FORCE_CLEANUP="$2"
   local DOKKU_APP_SKIP_CLEANUP
 
-  "$PLUGIN_CORE_AVAILABLE_PATH/common/common" --quiet docker-cleanup "$APP"
+  "$PLUGIN_CORE_AVAILABLE_PATH/common/common" --quiet docker-cleanup "$APP" "$FORCE_CLEANUP"
 }
 
 dokku_auth() {
diff --git a/tests/unit/docker-cleanup-force-flag.bats b/tests/unit/docker-cleanup-force-flag.bats
new file mode 100644
index 000000000..ff922e27c
--- /dev/null
+++ b/tests/unit/docker-cleanup-force-flag.bats
@@ -0,0 +1,27 @@
+#!/usr/bin/env bats
+
+setup() {
+  DOKKU_TEST_TMPDIR="$(mktemp -d)"
+  export DOKKU_TEST_ARGS_FILE="$DOKKU_TEST_TMPDIR/args"
+  export PLUGIN_CORE_AVAILABLE_PATH="$DOKKU_TEST_TMPDIR/plugin"
+
+  mkdir -p "$PLUGIN_CORE_AVAILABLE_PATH/common"
+  cat > "$PLUGIN_CORE_AVAILABLE_PATH/common/common" <<'EOF'
+#!/usr/bin/env bash
+printf '%s\n' "$@" > "$DOKKU_TEST_ARGS_FILE"
+EOF
+  chmod +x "$PLUGIN_CORE_AVAILABLE_PATH/common/common"
+
+  source "$BATS_TEST_DIRNAME/../../plugins/common/functions"
+}
+
+teardown() {
+  rm -rf "$DOKKU_TEST_TMPDIR"
+}
+
+@test "docker_cleanup forwards the manual force flag to the core command" {
+  run docker_cleanup --global true
+
+  [ "$status" -eq 0 ]
+  [ "$(cat "$DOKKU_TEST_ARGS_FILE")" = $'--quiet\ndocker-cleanup\n--global\ntrue' ]
+}

From 58d8a52234e029c843a7bd974a6da785b39ff1f1 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sat, 24 Oct 2026 12:03:06 -0400
Subject: [PATCH 2/2] fix: redirection operator in docker-cleanup test

---
 tests/unit/docker-cleanup-force-flag.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/docker-cleanup-force-flag.bats b/tests/unit/docker-cleanup-force-flag.bats
index ff922e27c..86bb692d2 100644
--- a/tests/unit/docker-cleanup-force-flag.bats
+++ b/tests/unit/docker-cleanup-force-flag.bats
@@ -6,7 +6,7 @@ setup() {
   export PLUGIN_CORE_AVAILABLE_PATH="$DOKKU_TEST_TMPDIR/plugin"
 
   mkdir -p "$PLUGIN_CORE_AVAILABLE_PATH/common"
-  cat > "$PLUGIN_CORE_AVAILABLE_PATH/common/common" <<'EOF'
+  cat >"$PLUGIN_CORE_AVAILABLE_PATH/common/common" <<'EOF'
 #!/usr/bin/env bash
 printf '%s\n' "$@" > "$DOKKU_TEST_ARGS_FILE"
 EOF