support for usage of multiple versions of a specific image

Author: lindt

compose_diff/__init__.py

@@ -78,6 +78,10 @@ def diff(self, old, new):
 
     @staticmethod
     def format_diff(old, new):
+        if old is not None and type(old) is list:
+            old = ', '.join(sorted(set(old)))
+        if new is not None and type(new) is list:
+            new = ', '.join(sorted(set(new)))
         if old is None:
             if new is None:
                 return ''
@@ -104,7 +108,9 @@ def image_versions(data):
                 continue
             image_name, tag = ComposeDiff.split_image(content['image'])
 
-            result[image_name] = tag
+            if image_name not in result:
+                result[image_name] = []
+            result[image_name].append(tag)
         return result
 
     @staticmethod

features/versions.feature

@@ -37,6 +37,33 @@ Feature: Versions
       | two | 2 (1) |
       """
 
+  Scenario: Multiple Versions for specific image
+    Given a file named "A.yml" with:
+      """
+      version: "2"
+      services:
+        one:
+          image: A:1
+        two:
+          image: A:2
+      """
+    And a file named "B.yml" with:
+      """
+      version: "2"
+      services:
+        one:
+          image: A:2
+        two:
+          image: A:3
+      """
+    When I run `bin/compose_diff --versions A.yml B.yml`
+    Then it should pass with exactly:
+      """
+      | Name | Version |
+      | - | - |
+      | A | 2, 3 (1, 2) |
+      """
+
   Scenario: Filter
     Given a file named "A.yml" with:
       """