docker-image-cleanup 0.1.3__tar.gz → 0.1.4__tar.gz

{docker_image_cleanup-0.1.3 → docker_image_cleanup-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: docker-image-cleanup
-Version: 0.1.3
+Version: 0.1.4
 Summary: Clean up old Docker images from local storage with retention controls
 Keywords: docker,cleanup,images,disk-space
 Author: Michael Bianco
@@ -132,4 +132,3 @@ Images with multiple tags are handled intelligently. If all tags on an image wou
 ---
 
 *This project was created from [iloveitaly/python-package-template](https://github.com/iloveitaly/python-package-template)*
-> theirs

{docker_image_cleanup-0.1.3 → docker_image_cleanup-0.1.4}/README.md

@@ -116,4 +116,3 @@ Images with multiple tags are handled intelligently. If all tags on an image wou
 ---
 
 *This project was created from [iloveitaly/python-package-template](https://github.com/iloveitaly/python-package-template)*
-> theirs

{docker_image_cleanup-0.1.3 → docker_image_cleanup-0.1.4}/docker_image_cleanup/__init__.py

@@ -113,7 +113,7 @@ def determine_cleanup_actions(
         if img.created >= min_age_threshold:
             keep_tags.update(img.tags)
 
-    images_to_delete_ids: set[str] = set()
+    images_to_delete: dict[str, int] = {}
     tags_to_remove: list[str] = []
 
     images_by_id: dict[str, list[ImageInfo]] = defaultdict(list)
@@ -142,7 +142,7 @@ def determine_cleanup_actions(
             if set(tags_for_this_image_to_remove) == current_image_repo_tags:
                 img_info = img_list[0]
                 if not img_info.is_in_use:
-                    images_to_delete_ids.add(img_id)
+                    images_to_delete[img_id] = img_info.size
                     total_size_saved += img_info.size
                 else:
                     log.warning(
@@ -152,7 +152,7 @@ def determine_cleanup_actions(
                     )
 
     return {
-        "images_to_delete": list(images_to_delete_ids),
+        "images_to_delete": images_to_delete,
         "tags_to_remove": list(set(tags_to_remove)),
         "total_size_saved": total_size_saved,
     }
@@ -160,7 +160,7 @@ def determine_cleanup_actions(
 
 def execute_cleanup(
     client: docker.DockerClient,
-    images_to_delete: list[str],
+    images_to_delete: dict[str, int],
     tags_to_remove: list[str],
     total_size_saved: int,
     dry_run: bool,
@@ -172,7 +172,7 @@ def execute_cleanup(
         if tags_to_remove:
             log.info("would remove tags", tags=tags_to_remove)
         if images_to_delete:
-            log.info("would remove images", image_ids=images_to_delete)
+            log.info("would remove images", image_ids=list(images_to_delete.keys()))
 
         log.info(
             "total space that would be saved",
@@ -184,19 +184,25 @@ def execute_cleanup(
     for tag in tags_to_remove:
         try:
             client.images.remove(tag, force=False)
-            log.info("untagged image", tag=tag)
+            log.info("removed tag", tag=tag)
         except docker.errors.APIError as e:
-            log.warning("skipped untagging", tag=tag, reason=str(e))
+            log.warning("skipped tag removal", tag=tag, reason=str(e))
 
-    for img_id in images_to_delete:
+    # We explicitly remove the Image ID here even after untagging.
+    # This is primarily to catch and clean up "dangling" images (images with no tags)
+    # that might have been orphaned but wouldn't be caught by the tag loop.
+    for img_id, size in images_to_delete.items():
         try:
-            img = client.images.get(img_id)
-            size = img.attrs.get("Size", 0)
             client.images.remove(img_id, force=False)
             log.info("removed image", image_id=img_id, size=format_size(size))
             executed_size_saved += size
         except docker.errors.ImageNotFound:
-            log.warning("image already removed", image_id=img_id)
+            # If the image is not found here, it means Docker automatically deleted
+            # the underlying image data when we removed its last tag in the loop above.
+            log.info(
+                "image removed via untagging", image_id=img_id, size=format_size(size)
+            )
+            executed_size_saved += size
         except docker.errors.APIError as e:
             log.warning("skipped image removal", image_id=img_id, reason=str(e))
 

{docker_image_cleanup-0.1.3 → docker_image_cleanup-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "docker-image-cleanup"
-version = "0.1.3"
+version = "0.1.4"
 description = "Clean up old Docker images from local storage with retention controls"
 keywords = ["docker", "cleanup", "images", "disk-space"]
 readme = "README.md"