Fix docker#5465 by catching a no-image exception in

get_container_data_volumes. Added a case to the unit test to check that an empty existing image doesn't result in an exception. Signed-off-by: Ian Glen Neal <[email protected]> Signed-off-by: Ian Glen Neal <[email protected]>
Rozelette · Jan 11, 2018 · d0cc1a7 · d0cc1a7
1 parent b2d4d9f
commit d0cc1a7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/compose/service.py b/compose/service.py
@@ -1310,17 +1310,21 @@ def get_container_data_volumes(container, volumes_option, tmpfs_option, mounts_o
     """
     volumes = []
     volumes_option = volumes_option or []
+    image_volumes = []
 
     container_mounts = dict(
         (mount['Destination'], mount)
         for mount in container.get('Mounts') or {}
     )
 
-    image_volumes = [
-        VolumeSpec.parse(volume)
-        for volume in
-        container.image_config['ContainerConfig'].get('Volumes') or {}
-    ]
+    try:
+        image_volumes = [
+            VolumeSpec.parse(volume)
+            for volume in
+            container.image_config['ContainerConfig'].get('Volumes') or {}
+        ]
+    except ImageNotFound:
+        return volumes
 
     for volume in set(volumes_option + image_volumes):
         # No need to preserve host volumes

diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py
@@ -926,6 +926,14 @@ def test_get_container_data_volumes(self):
         volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [])
         assert sorted(volumes) == sorted(expected)
 
+        # Issue 5465, check for non-existant image.
+
+        container = Container(self.mock_client, {}, has_been_inspected=True)
+        expected = []
+
+        volumes, _ = get_container_data_volumes(container, options, ['/dev/tmpfs'], [])
+        assert sorted(volumes) == sorted(expected)
+
     def test_merge_volume_bindings(self):
         options = [
             VolumeSpec.parse(v, True) for v in [