From 819f5e6450cd50eac8484d88bb48b4949885bcc0 Mon Sep 17 00:00:00 2001
From: Gmer4Lfe <gmer4lfe@gmail.com>
Date: Sun, 7 Jun 2026 09:54:42 -0400
Subject: [PATCH] Remove old images by ID after container updates, not just
 dangling prune

Tagged images are never caught by docker image prune -f. Collect OLD_IDs
during the pull loop and explicitly rmi them after rebuilds complete.
---
 Docker_Essentials/docker_update.sh           | 14 ++++++++++----
 Docker_Essentials/docker_update_remaining.sh |  7 ++++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Docker_Essentials/docker_update.sh b/Docker_Essentials/docker_update.sh
index e2f4073..5a6514e 100755
--- a/Docker_Essentials/docker_update.sh
+++ b/Docker_Essentials/docker_update.sh
@@ -257,6 +257,7 @@ START=$(date +%s)
 UPDATED=()
 UP_TO_DATE=()
 FAILED=()
+OLD_IMAGE_IDS=()   # old image IDs to explicitly remove after rebuilds
 SKIPPED=()
 
 for container in "${TARGET_CONTAINERS[@]}"; do
@@ -301,6 +302,7 @@ for container in "${TARGET_CONTAINERS[@]}"; do
         if [[ -n "$OLD_ID" ]] && [[ "$OLD_ID" != "$NEW_ID" ]]; then
             log "$ICON_DONE  $container — updated ✅ (${OLD_ID:7:12} → ${NEW_ID:7:12})"
             UPDATED+=("$container")
+            OLD_IMAGE_IDS+=("$OLD_ID")
         else
             log "$container — already up to date (${NEW_ID:7:12})"
             UP_TO_DATE+=("$container")
@@ -338,13 +340,17 @@ if [[ ${#UPDATED[@]} -gt 0 ]]; then
     done
 fi
 
-# ── Prune dangling images ─────────────────────────────────────────────────────
-# Old images become dangling after a pull lands a new digest. Prune here so
-# they don't accumulate across daily runs.
+# ── Remove old images ────────────────────────────────────────────────────────
+# Explicitly rmi by the IDs captured before each pull. Tagged images are never
+# caught by dangling-only prune, so this is the only reliable cleanup path.
+# Fall through to dangling prune to catch any leftovers from other update paths.
 if [[ "$DRY_RUN" == true ]]; then
-    warn "DRY RUN — would prune dangling images"
+    warn "DRY RUN — would remove ${#OLD_IMAGE_IDS[@]} old image(s) and prune dangling"
     PRUNED_SUMMARY="(dry run)"
 else
+    for _old_id in "${OLD_IMAGE_IDS[@]}"; do
+        docker rmi "$_old_id" >/dev/null 2>&1 || true
+    done
     PRUNED_OUTPUT=$(docker image prune -f 2>&1)
     [[ "$ENABLE_LOGGING" == "true" ]] && echo "$PRUNED_OUTPUT" | sed 's/^/  /'
     PRUNED_SUMMARY=$(echo "$PRUNED_OUTPUT" | grep -E "^Total reclaimed" || echo "nothing reclaimed")
diff --git a/Docker_Essentials/docker_update_remaining.sh b/Docker_Essentials/docker_update_remaining.sh
index 51de1c3..cdefc66 100755
--- a/Docker_Essentials/docker_update_remaining.sh
+++ b/Docker_Essentials/docker_update_remaining.sh
@@ -166,6 +166,7 @@ START=$(date +%s)
 UPDATED=()
 UP_TO_DATE=()
 FAILED=()
+OLD_IMAGE_IDS=()
 
 for container in "${REMAINING[@]}"; do
     [[ -z "$container" ]] && continue
@@ -202,6 +203,7 @@ for container in "${REMAINING[@]}"; do
         if [[ -n "$OLD_ID" ]] && [[ "$OLD_ID" != "$NEW_ID" ]]; then
             log "$ICON_DONE  $container — updated ✅ (${OLD_ID:7:12} → ${NEW_ID:7:12})"
             UPDATED+=("$container")
+            OLD_IMAGE_IDS+=("$OLD_ID")
         else
             log "$container — already up to date (${NEW_ID:7:12})"
             UP_TO_DATE+=("$container")
@@ -269,9 +271,12 @@ echo ""
 echo "━━━ $ICON_SYNC Pruning Dangling Images — $(date '+%Y-%m-%d %H:%M:%S') ━━━"
 
 if [[ "$DRY_RUN" == true ]]; then
-    warn "DRY RUN — would prune dangling images"
+    warn "DRY RUN — would remove ${#OLD_IMAGE_IDS[@]} old image(s) and prune dangling"
     PRUNED_SUMMARY="(dry run)"
 else
+    for _old_id in "${OLD_IMAGE_IDS[@]}"; do
+        docker rmi "$_old_id" >/dev/null 2>&1 || true
+    done
     PRUNED_OUTPUT=$(docker image prune -f 2>&1)
     [[ "$ENABLE_LOGGING" == "true" ]] && echo "$PRUNED_OUTPUT" | sed 's/^/  /'
     PRUNED_SUMMARY=$(echo "$PRUNED_OUTPUT" | grep -E "^Total reclaimed" || echo "nothing reclaimed")