diff --git a/common-functions b/common-functions index 3e20300..9f6e7e7 100755 --- a/common-functions +++ b/common-functions @@ -590,7 +590,7 @@ service_link() { fi [[ -n $LINK ]] && dokku_log_fail "Already linked as $LINK" - plugn trigger service-action pre-link "$SERVICE" "$APP" + plugn trigger service-action pre-link "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" add_to_links_file "$SERVICE" "$APP" if declare -f -F add_passed_docker_option >/dev/null; then @@ -601,13 +601,13 @@ service_link() { dokku docker-options:add "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_DNS_HOSTNAME" fi [[ -n "$SERVICE_QUERYSTRING" ]] && SERVICE_URL="${SERVICE_URL}?${SERVICE_QUERYSTRING}" - plugn trigger service-action post-link "$SERVICE" "$APP" + plugn trigger service-action post-link "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]]; then config_set --no-restart "$APP" "${ALIAS}_URL=$SERVICE_URL" else config_set "$APP" "${ALIAS}_URL=$SERVICE_URL" fi - plugn trigger service-action post-link-complete "$SERVICE" "$APP" + plugn trigger service-action post-link-complete "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" } service_linked_apps() { @@ -917,7 +917,7 @@ service_unlink() { local SERVICE_DNS_HOSTNAME=$(service_dns_hostname "$SERVICE") local LINK=($(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1)) || true - plugn trigger service-action pre-unlink "$SERVICE" "$APP" + plugn trigger service-action pre-unlink "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" remove_from_links_file "$SERVICE" "$APP" if declare -f -F add_passed_docker_option >/dev/null; then @@ -929,13 +929,13 @@ service_unlink() { fi [[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP" - plugn trigger service-action post-unlink "$SERVICE" "$APP" + plugn trigger service-action post-unlink "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" if [[ "$DOKKU_GLOBAL_FLAGS" == *"--no-restart"* ]]; then config_unset --no-restart "$APP" "${LINK[@]}" else config_unset "$APP" "${LINK[@]}" fi - plugn trigger service-action post-unlink-complete "$SERVICE" "$APP" + plugn trigger service-action post-unlink-complete "$PLUGIN_COMMAND_PREFIX" "$SERVICE" "$APP" } service_version() { diff --git a/functions b/functions index f634d4a..74c70eb 100755 --- a/functions +++ b/functions @@ -40,7 +40,7 @@ service_create() { docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed" fi - plugn trigger service-action pre-create "$SERVICE" + plugn trigger service-action pre-create "$PLUGIN_COMMAND_PREFIX" "$SERVICE" mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory" mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory" touch "$LINKS_FILE" @@ -55,9 +55,9 @@ service_create() { service_commit_config "$SERVICE" write_database_name "$SERVICE" - plugn trigger service-action post-create "$SERVICE" + plugn trigger service-action post-create "$PLUGIN_COMMAND_PREFIX" "$SERVICE" service_create_container "$SERVICE" - plugn trigger service-action post-create-complete "$SERVICE" + plugn trigger service-action post-create-complete "$PLUGIN_COMMAND_PREFIX" "$SERVICE" } service_create_container() { diff --git a/subcommands/destroy b/subcommands/destroy index e912058..c8534c4 100755 --- a/subcommands/destroy +++ b/subcommands/destroy @@ -41,7 +41,7 @@ service-destroy-cmd() { fi dokku_log_info2_quiet "Deleting $SERVICE" - plugn trigger service-action pre-delete "$SERVICE" + plugn trigger service-action pre-delete "$PLUGIN_COMMAND_PREFIX" "$SERVICE" service_backup_unschedule "$SERVICE" service_container_rm "$SERVICE" @@ -49,7 +49,7 @@ service-destroy-cmd() { docker run --rm -v "$SERVICE_HOST_ROOT/data:/data" -v "$SERVICE_HOST_ROOT/$PLUGIN_CONFIG_SUFFIX:/config" "$PLUGIN_BUSYBOX_IMAGE" chmod 777 -R /config /data rm -rf "$SERVICE_ROOT" - plugn trigger service-action post-delete "$SERVICE" + plugn trigger service-action post-delete "$PLUGIN_COMMAND_PREFIX" "$SERVICE" dokku_log_info2 "$PLUGIN_SERVICE container deleted: $SERVICE" }