From d4475e582d399d26c8a7870edcf48ef760cba0f8 Mon Sep 17 00:00:00 2001 From: Josh Manders Date: Thu, 17 Nov 2016 16:06:57 -0600 Subject: [PATCH] pass plugin to uninstall --- docs/development/plugin-triggers.md | 6 ++++-- plugins/plugin/functions | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md index b19d8f184..27fd3c6f4 100644 --- a/docs/development/plugin-triggers.md +++ b/docs/development/plugin-triggers.md @@ -869,7 +869,7 @@ some code to remove a docker hub tag because it's not implemented in the CLI.... ### `uninstall` - Description: Used to cleanup after itself. - Invoked by: `dokku plugin:uninstall` - - Arguments: None + - Arguments: `$PLUGIN` - Example: ```shell @@ -878,7 +878,9 @@ some code to remove a docker hub tag because it's not implemented in the CLI.... set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x - docker rmi -f "${PLUGIN_IMAGE_DEPENDENCY}" + PLUGIN="$1" + + [[ "$PLUGIN" = "my-plugin" ]] && docker rmi -f "${PLUGIN_IMAGE_DEPENDENCY}" ``` ### `update` diff --git a/plugins/plugin/functions b/plugins/plugin/functions index abed5c29b..3b814d7f8 100755 --- a/plugins/plugin/functions +++ b/plugins/plugin/functions @@ -70,7 +70,7 @@ uninstall_plugin() { local PLUGIN="$1" [[ -e $PLUGIN_CORE_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Cannot uninstall a core plugin" [[ ! -e $PLUGIN_AVAILABLE_PATH/$PLUGIN ]] && dokku_log_fail "Plugin ($PLUGIN) is not currently installed" - plugn trigger uninstall + plugn trigger uninstall "$PLUGIN" plugn uninstall "$PLUGIN" dokku_log_info1_quiet "Plugin $PLUGIN uninstalled" }