From 652a9ec26cdcc818a0c9cf714535804952b198cc Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 29 Jul 2022 22:45:23 -0400 Subject: [PATCH] chore: switch to correct trigger when getting a global argument While both will now work, using the correct trigger will skip some extra logic. --- plugins/common/docker.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/common/docker.go b/plugins/common/docker.go index 50dcf8aff..95d1b2f0d 100644 --- a/plugins/common/docker.go +++ b/plugins/common/docker.go @@ -172,7 +172,14 @@ func DockerCleanup(appName string, forceCleanup bool) error { if !forceCleanup { skipCleanup := false if appName != "" { - b, _ := PlugnTriggerOutput("config-get", []string{appName, "DOKKU_SKIP_CLEANUP"}...) + triggerName := "config-get" + triggerArgs := []string{appName, "DOKKU_SKIP_CLEANUP"} + if appName == "--global" { + triggerName = "config-get-global" + triggerArgs = []string{"DOKKU_SKIP_CLEANUP"} + } + + b, _ := PlugnTriggerOutput(triggerName, triggerArgs...) output := strings.TrimSpace(string(b[:])) if output == "true" { skipCleanup = true