scripts/docker/app/uninstall/down_remove_app.sh

@@ -1,36 +1,30 @@
 #!/bin/bash
 
-# Take an app's containers down + remove them. Two paths run in order:
-#
-#   1. `docker compose down -v --remove-orphans` from the app dir. Best
-#      path — clean shutdown, named volumes pruned, orphans swept. Only
-#      runs when the compose file is still on disk.
-#
-#   2. Name-based fallback (`dockerRemoveApp`): `docker ps -aqf name=$app`
-#      → stop + rm. Always runs, even when compose down succeeded, to
-#      catch containers compose wouldn't pick up — renamed/relabelled
-#      ones, leftovers from a previously-failed uninstall, and the case
-#      the user flagged: app dir already gone, compose step skipped,
-#      containers were still running.
 dockerComposeDownRemove()
 {
     local app_name="$1"
 
-    if [[ -z "$app_name" ]]; then
+    if [[ "$app_name" == "" ]]; then
         isError "No app_name provided, unable to continue..."
-        return 1
-    fi
-
-    if [[ -d "$containers_dir$app_name" ]]; then
-        isNotice "Shutting down & removing all $app_name container data"
-        if [[ "$CFG_DOCKER_INSTALL_TYPE" == "rootless" ]]; then
-            dockerCommandRunInstallUser "cd $containers_dir$app_name && docker compose down -v --remove-orphans" >/dev/null 2>&1
-        else
-            (cd "$containers_dir$app_name" && docker compose down -v --remove-orphans) >/dev/null 2>&1
-        fi
     else
-        isNotice "App directory '$app_name' not found — falling back to name-based container cleanup."
+        if [[ "$OS_TYPE" == "Ubuntu" || "$OS_TYPE" == "Debian" ]]; then
+            if [[ $CFG_DOCKER_INSTALL_TYPE == "rootless" ]]; then
+                if [[ -d "$containers_dir$app_name" ]]; then
+                    local result=$(dockerCommandRunInstallUser "cd $containers_dir$app_name && docker compose down -v --remove-orphans")
+                    isNotice "Shutting down & Removing all $app_name container data"
+                    dockerRemoveApp $app_name;
+                else
+                    isNotice "App directory '$app_name' not found. Skipping container shutdown."
+                fi
+            elif [[ $CFG_DOCKER_INSTALL_TYPE == "rooted" ]]; then
+                if [[ -d "$containers_dir$app_name" ]]; then
+                    local result=$(cd $containers_dir$app_name && docker compose down -v --remove-orphans)
+                    isNotice "Shutting down & Removing all $app_name container data"
+                    dockerRemoveApp $app_name;
+                else
+                    isNotice "App directory '$app_name' not found. Skipping container shutdown."
+                fi
+            fi
+        fi
     fi
-
-    dockerRemoveApp "$app_name"
-}
+}

scripts/docker/app/uninstall/uninstall_app.sh

@@ -47,7 +47,7 @@ dockerUninstallApp()
             echo ""
             dockerRemoveAppImages $stored_app_name;
         else
-            echo "---- $menu_number. Keeping Docker images"
+            echo "---- $menu_number. Keeping Docker images (pass --delete-images to remove)"
             echo ""
             isNotice "Docker images for '$stored_app_name' left in place. A reinstall will reuse them."
         fi