From e8d998233093342e813d82b31052456448c05811 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 8 Aug 2021 01:57:44 -0400
Subject: [PATCH] chore: drop unnecessary scheduler-docker-cleanup hook

All the logic was already called from docker-cleanup, so this just lengthened the cleanup time.
---
 docs/appendices/0.25.0-migration-guide.md     |  1 +
 docs/development/plugin-triggers.md           | 19 --------
 plugins/common/docker.go                      | 10 -----
 .../scheduler-docker-cleanup                  | 45 -------------------
 4 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100755 plugins/scheduler-docker-local/scheduler-docker-cleanup

diff --git a/docs/appendices/0.25.0-migration-guide.md b/docs/appendices/0.25.0-migration-guide.md
index 4a59b285b..31c7cc3f0 100644
--- a/docs/appendices/0.25.0-migration-guide.md
+++ b/docs/appendices/0.25.0-migration-guide.md
@@ -31,3 +31,4 @@ The [dokku-registry](https://github.com/dokku/dokku-registry) plugin is now buil
 
 - As of April 2021, Ubuntu 16.04 is no longer an LTS release, and support has been removed. Packages may still install on older versions of Ubuntu, but are no longer tested, and therefore no support will be provided.
 - The web installer has been removed. Users are now required to setup Dokku via cli commands. This change was made to combat potential security issues where users ignored the web installer, allowing unauthorized users to add their keys to the host.
+- The `scheduler-docker-cleanup` plugin trigger has been removed from the scheduler interface, and is no longer invoked.
diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index d2b0416d3..54bc763cc 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -2028,25 +2028,6 @@ DOKKU_SCHEDULER="$1"; APP="$2"; IMAGE_TAG="$3";
 # TODO
 ```
 
-### `scheduler-docker-cleanup`
-
-> Warning: The scheduler plugin trigger apis are under development and may change
-> between minor releases until the 1.0 release.
-
-- Description: Allows you to run scheduler commands when dokku cleanup is invoked
-- Invoked by: `dokku deploy, dokku cleanup`
-- Arguments: `$DOKKU_SCHEDULER $APP $FORCE_CLEANUP`
-- Example:
-
-```shell
-#!/usr/bin/env bash
-
-set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
-DOKKU_SCHEDULER="$1"; APP="$2"; FORCE_CLEANUP="$3";
-
-# TODO
-```
-
 ### `scheduler-enter`
 
 > Warning: The scheduler plugin trigger apis are under development and may change
diff --git a/plugins/common/docker.go b/plugins/common/docker.go
index ca2a19340..50dcf8aff 100644
--- a/plugins/common/docker.go
+++ b/plugins/common/docker.go
@@ -186,20 +186,10 @@ func DockerCleanup(appName string, forceCleanup bool) error {
 	}
 
 	LogInfo1("Cleaning up...")
-	scheduler := GetAppScheduler(appName)
 	if appName == "--global" {
 		appName = ""
 	}
 
-	forceCleanupArg := "false"
-	if forceCleanup {
-		forceCleanupArg = "true"
-	}
-
-	if err := PlugnTrigger("scheduler-docker-cleanup", []string{scheduler, appName, forceCleanupArg}...); err != nil {
-		return fmt.Errorf("Failure while cleaning up app: %s", err)
-	}
-
 	// delete all non-running and dead containers
 	exitedContainerIDs, _ := listContainers("exited", appName)
 	deadContainerIDs, _ := listContainers("dead", appName)
diff --git a/plugins/scheduler-docker-local/scheduler-docker-cleanup b/plugins/scheduler-docker-local/scheduler-docker-cleanup
deleted file mode 100755
index 1496a0b37..000000000
--- a/plugins/scheduler-docker-local/scheduler-docker-cleanup
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-[[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-
-trigger-scheduler-docker-local-scheduler-docker-cleanup() {
-  declare desc="scheduler-docker-local scheduler-docker-cleanup plugin trigger"
-  declare trigger="scheduler-docker-cleanup"
-  declare DOKKU_SCHEDULER="$1" APP="$2" FORCE_CLEANUP="$3"
-
-  if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
-    return
-  fi
-
-  if [[ -n "$APP" ]]; then
-    # delete all non-running containers
-    # shellcheck disable=SC2046
-    "$DOCKER_BIN" container rm $("$DOCKER_BIN" container list --all --filter "status=exited" --filter "label=$DOKKU_CONTAINER_LABEL" --filter "label=com.dokku.app-name=$APP" --quiet) &>/dev/null || true
-
-    # delete all dead containers
-    # shellcheck disable=SC2046
-    "$DOCKER_BIN" container rm $("$DOCKER_BIN" container list --all --filter "status=dead" --filter "label=$DOKKU_CONTAINER_LABEL" --filter "label=com.dokku.app-name=$APP" --quiet) &>/dev/null || true
-
-    # delete danging images
-    # shellcheck disable=SC2046
-    "$DOCKER_BIN" image rm $("$DOCKER_BIN" image list --filter 'dangling=true' --filter "label=com.dokku.app-name=$APP" --quiet) &>/dev/null || true
-
-    # delete unused images
-    "$DOCKER_BIN" image prune --all --filter "label=com.dokku.app-name=$APP" --force &>/dev/null || true
-  else
-    # delete all non-running containers
-    # shellcheck disable=SC2046
-    "$DOCKER_BIN" container rm $("$DOCKER_BIN" container list --all --filter "status=exited" --filter "label=$DOKKU_CONTAINER_LABEL" --quiet) &>/dev/null || true
-
-    # delete all dead containers
-    # shellcheck disable=SC2046
-    "$DOCKER_BIN" container rm $("$DOCKER_BIN" container list --all --filter "status=dead" --filter "label=$DOKKU_CONTAINER_LABEL" --quiet) &>/dev/null || true
-
-    # delete danging images
-    # shellcheck disable=SC2046
-    "$DOCKER_BIN" image rm $("$DOCKER_BIN" image list --filter 'dangling=true' --quiet) &>/dev/null || true
-  fi
-}
-
-trigger-scheduler-docker-local-scheduler-docker-cleanup "$@"