Handle volumes from the Dockerfile.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>

compose/service.py

@@ -527,13 +527,18 @@ def get_container_data_volumes(container, volumes_option):
     a mapping of volume bindings for those volumes.
     """
     volumes = []
-    for volume in volumes_option or []:
+
+    volumes_option = volumes_option or []
+    container_volumes = container.get('Volumes') or {}
+    original_volumes = set(volumes_option + container_volumes.keys())
+
+    for volume in original_volumes:
         volume = parse_volume_spec(volume)
         # No need to preserve host volumes
         if volume.external:
             continue
 
-        volume_path = (container.get('Volumes') or {}).get(volume.internal)
+        volume_path = container_volumes.get(volume.internal)
         # New volume, doesn't exist in the old container
         if not volume_path:
             continue

tests/integration/service_test.py

@@ -183,7 +183,7 @@ def test_recreate_containers_when_containers_are_stopped(self):
 
     def test_recreate_containers_with_image_declared_volume(self):
         service = Service(
-            project='figtest',
+            project='composetest',
             name='db',
             client=self.client,
             build='tests/fixtures/dockerfile-with-volume',
@@ -193,9 +193,7 @@ def test_recreate_containers_with_image_declared_volume(self):
         self.assertEqual(old_container.get('Volumes').keys(), ['/data'])
         volume_path = old_container.get('Volumes')['/data']
 
-        service.recreate_containers()
-        new_container = service.containers()[0]
-        service.start_container(new_container)
+        new_container = service.recreate_containers()[0]
         self.assertEqual(new_container.get('Volumes').keys(), ['/data'])
         self.assertEqual(new_container.get('Volumes')['/data'], volume_path)