Merge branch 'containrrr:main' into main

bigmangos · Nov 12, 2023 · c599a9f · c599a9f
2 parents f4a56a0 + a047c7f
commit c599a9f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/internal/actions/check.go b/internal/actions/check.go
@@ -39,7 +39,11 @@ func CheckForSanity(client container.Client, filter types.Filter, rollingRestart
 // will stop and remove all but the most recently started container. This behaviour can be bypassed
 // if a scope UID is defined.
 func CheckForMultipleWatchtowerInstances(client container.Client, cleanup bool, scope string) error {
-	containers, err := client.ListContainers(filters.FilterByScope(scope, filters.WatchtowerContainersFilter))
+	filter := filters.WatchtowerContainersFilter
+	if scope != "" {
+		filter = filters.FilterByScope(scope, filter)
+	}
+	containers, err := client.ListContainers(filter)
 
 	if err != nil {
 		return err