Handle volumes from the Dockerfile.

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

Author: dnephin

compose/cli/docker_client.py

@@ -32,4 +32,4 @@ def docker_client():
         )
 
     timeout = int(os.environ.get('DOCKER_CLIENT_TIMEOUT', 60))
-    return Client(base_url=base_url, tls=tls_config, version='1.14', timeout=timeout)
+    return Client(base_url=base_url, tls=tls_config, timeout=timeout)

compose/service.py

@@ -7,6 +7,7 @@
 from operator import attrgetter, itemgetter
 import sys
 
+import docker.utils
 from docker.errors import APIError
 
 from .container import Container, get_container_name
@@ -281,24 +282,27 @@ def recreate_container(self, container, **override_options):
                 raise
 
         intermediate_options = dict(self.options, **override_options)
+        volume_binds = get_container_data_volumes(
+            container,
+            intermediate_options.get('volumes'))
         intermediate_container = Container.create(
             self.client,
             image=container.image,
             entrypoint=['/bin/echo'],
             command=[],
             detach=True,
+            host_config=docker.utils.create_host_config(binds=volume_binds),
         )
-        volume_binds = get_container_data_volumes(
-            container,
-            intermediate_options.get('volumes'))
-        intermediate_container.start(binds=volume_binds)
+        intermediate_container.start()
         intermediate_container.wait()
         container.remove()
 
         volumes = remove_existing_volumes(
             self.options.get('volumes', []),
             volume_binds)
-        options = dict(override_options, volumes=volumes)
+        options = dict(
+            override_options,
+            host_config=docker.utils.create_host_config(binds=volume_binds))
         new_container = self.create_container(do_build=False, **options)
         self.start_container(
             new_container,
@@ -527,13 +531,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

requirements.txt

@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==0.6.0
+docker-py==0.7.1
 dockerpty==0.3.2
 docopt==0.6.1
 requests==2.2.1

setup.py

@@ -30,7 +30,7 @@ def find_version(*file_paths):
     'requests >= 2.2.1, < 3',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.11.0, < 0.12',
-    'docker-py >= 0.6.0, < 0.7',
+    'docker-py >= 0.7.1, < 0.8',
     'dockerpty >= 0.3.2, < 0.4',
     'six >= 1.3.0, < 2',
 ]

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)