utils_devops 0.1.172__py3-none-any.whl → 0.1.174__py3-none-any.whl

utils_devops/extras/docker_ops.py

@@ -3811,7 +3811,7 @@ def _perform_post_deployment_cleanup(
     
     try:
         # Cleanup old images
-        removed_images = cleanup_old_images(keep_count=keep_image_versions)
+        removed_images = cleanup_old_images_by_compose(keep_count=keep_image_versions,compose_file=compose_file)
         cleanup_results["images_removed"] = removed_images
         logger.info(f"Cleaned up {len(removed_images)} old images")
         
@@ -4002,6 +4002,80 @@ def get_compose_status(compose_file: str, env_file: Optional[str] = None) -> Dic
     
     return status
 
+
+def cleanup_old_images_by_compose(keep_count: int = 3, dry_run: bool = False, compose_file: Optional[str] = None, env_file: Optional[str] = None) -> List[str]:
+    """Clean up old Docker images, optionally limited to those in a compose file from compose"""
+    removed = []
+    
+    try:
+        # Get all images
+        result = run_docker_command(["docker", "images", "--format", "{{.ID}}|{{.Repository}}|{{.Tag}}|{{.CreatedAt}}"])
+        
+        images = []
+        for line in result.stdout.strip().splitlines():
+            if line.strip():
+                parts = line.split('|', 3)
+                if len(parts) == 4:
+                    images.append({
+                        'id': parts[0],
+                        'repository': parts[1],
+                        'tag': parts[2],
+                        'created': parts[3]
+                    })
+        
+        # Group by repository
+        all_repos = {}
+        for img in images:
+            repo = img['repository']
+            if repo not in all_repos:
+                all_repos[repo] = []
+            all_repos[repo].append(img)
+        
+        # Determine which repos to clean
+        repos_to_clean = all_repos  # Default: all
+        
+        if compose_file:
+            try:
+                compose_data = read_compose_file(compose_file, env_file)
+                services = list(compose_data.get('services', {}).keys())
+                
+                compose_repos = set()
+                for service in services:
+                    image = get_service_image(compose_file, service, env_file)
+                    if image:
+                        repo_tag = image.split(':')
+                        repo = repo_tag[0]
+                        compose_repos.add(repo)
+                
+                # Filter to only compose repos
+                repos_to_clean = {repo: imgs for repo, imgs in all_repos.items() if repo in compose_repos}
+                
+                if not compose_repos:
+                    logger.warning("No services/images found in compose file, falling back to all images")
+                    repos_to_clean = all_repos
+            except Exception as e:
+                logger.warning(f"Error reading compose file: {e}, falling back to all images")
+                repos_to_clean = all_repos
+        
+        # Clean up
+        for repo, repo_images in repos_to_clean.items():
+            # Sort by creation date (newest first)
+            repo_images.sort(key=lambda x: x['created'], reverse=True)
+            
+            # Remove old images
+            for old_img in repo_images[keep_count:]:
+                if dry_run:
+                    logger.info(f"Would remove: {old_img['repository']}:{old_img['tag']}")
+                else:
+                    remove_result = run_docker_command(["docker", "rmi", old_img['id']])
+                    if remove_result.rc == 0:
+                        removed.append(f"{old_img['repository']}:{old_img['tag']}")
+    
+    except Exception as e:
+        logger.error(f"Image cleanup failed: {e}")
+    
+    return removed
+
 def cleanup_old_images(keep_count: int = 3, dry_run: bool = False) -> List[str]:
     """Clean up old Docker images"""
     removed = []
@@ -4923,7 +4997,7 @@ __all__ = [
     # Backup & restore
     "backup_compose", "restore_compose",
     # Utilities
-    "get_compose_status", "cleanup_old_images",
+    "get_compose_status", "cleanup_old_images", "cleanup_old_images_by_compose",
     # Data classes
     "ExecResult", "LogLine", "ContainerInfo",
     # Exceptions

{utils_devops-0.1.172.dist-info → utils_devops-0.1.174.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: utils_devops
-Version: 0.1.172
+Version: 0.1.174
 Summary: Lightweight DevOps utilities for automation scripts: config editing (YAML/JSON/INI/.env), templating, diffing, and CLI tools
 License: MIT
 Keywords: devops,automation,nginx,cli,jinja2,yaml,config,diff,templating,logging,docker,compose,file-ops

{utils_devops-0.1.172.dist-info → utils_devops-0.1.174.dist-info}/RECORD

@@ -9,7 +9,7 @@ utils_devops/core/strings.py,sha256=8s0GSjcyTKwLjJjsJ_XfOJxPtyb549icDlU9SUxSvHI,
 utils_devops/core/systems.py,sha256=wNbEFUAvbMPdqWN-iXvTzvj5iE9xaWfjZYYvD0EZAH0,47577
 utils_devops/extras/__init__.py,sha256=ZXHeVLHO3_qiW9AY-UQ_YA9cQzmkLGv54a2UbyvtlM0,3571
 utils_devops/extras/aws_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utils_devops/extras/docker_ops.py,sha256=QNa3oSXFB4LrXRprEvdJ32KkmXM7ch0IA2MKvTII0pY,198747
+utils_devops/extras/docker_ops.py,sha256=vH8LmUNUyFj5D3tLuFUERMdpUTtxJXjsdoKPo1bYRjU,201890
 utils_devops/extras/git_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utils_devops/extras/interaction_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utils_devops/extras/metrics_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,7 +19,7 @@ utils_devops/extras/notification_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 utils_devops/extras/performance_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utils_devops/extras/ssh_ops.py,sha256=hTOYzyWmnZWzOLeZbCoZRLxSJiBmr0QgS_87qks-CYk,76305
 utils_devops/extras/vault_ops.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utils_devops-0.1.172.dist-info/METADATA,sha256=CWFA-5L6IZJSyJX07zHd_v5X7OAhbg-evhM8bwZuXgg,1903
-utils_devops-0.1.172.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-utils_devops-0.1.172.dist-info/entry_points.txt,sha256=ei3B6ZL5yu6dOq-U1r8wsBdkXeg63RAyV7m8_ADaE6k,53
-utils_devops-0.1.172.dist-info/RECORD,,
+utils_devops-0.1.174.dist-info/METADATA,sha256=Xzmk7zfD03BT8zkZgdrtl1UH2rMU6ynit-ws5oCiPUo,1903
+utils_devops-0.1.174.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+utils_devops-0.1.174.dist-info/entry_points.txt,sha256=ei3B6ZL5yu6dOq-U1r8wsBdkXeg63RAyV7m8_ADaE6k,53
+utils_devops-0.1.174.dist-info/RECORD,,