From dfeef784bd96ce7579b1645887f351f4ab66ade0 Mon Sep 17 00:00:00 2001
From: riley <riley@tench.com>
Date: Tue, 12 Sep 2023 12:04:37 -0400
Subject: [PATCH] Fixed the way rm works for better cleanup

---
 root/usr/libexec/apps/btcpayserver/btcpayserver.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/root/usr/libexec/apps/btcpayserver/btcpayserver.sh b/root/usr/libexec/apps/btcpayserver/btcpayserver.sh
index 5d7b5af..315795c 100755
--- a/root/usr/libexec/apps/btcpayserver/btcpayserver.sh
+++ b/root/usr/libexec/apps/btcpayserver/btcpayserver.sh
@@ -78,15 +78,13 @@ case "${ACTION}" in
     do_install_detail
     ;;
   "rm")
-    IMAGE_NAME=$(uci get btcpayserver.@btcpayserver[0].image_name 2>/dev/null)
-    [ -z "$IMAGE_NAME" ] && IMAGE_NAME="btcpayserver"
-    CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
     echo "Stopping and removing containers..."
+    CONTAINER_IDS=$(docker ps -a | grep 'btcpayserver\|generated_' | awk '{print $1}')
     for ID in $CONTAINER_IDS; do
       docker stop "$ID"
       docker rm "$ID"
     done
-    docker rmi -f "$IMAGE_NAME"
+    docker rmi -f $(docker images | grep 'btcpayserver' | awk '{print $3}')
     rm -r /opt/docker2/compose/btcpayserver  2>/dev/null
     rm -rf /opt/docker2/compose/btcpayserver/btcpayserver-docker 2>/dev/null  # Removing the btcpayserver-docker directory
     ;;