jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix copying of volumes by using the name of the volume instead of the host path.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-02-16 14:24:17 -05:00
commit 4a09da43ea
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/unit/service_test.py
View file

@ -691,8 +691,8 @@ class ServiceVolumesTest(unittest.TestCase):
}, has_been_inspected=True)
expected = [
VolumeSpec.parse('/var/lib/docker/aaaaaaaa:/existing/volume:rw'),
VolumeSpec.parse('/var/lib/docker/cccccccc:/mnt/image/data:rw'),
VolumeSpec.parse('existingvolume:/existing/volume:rw'),
VolumeSpec.parse('imagedata:/mnt/image/data:rw'),
]
volumes = get_container_data_volumes(container, options)
@ -724,11 +724,11 @@ class ServiceVolumesTest(unittest.TestCase):
expected = [
'/host/volume:/host/volume:ro',
'/host/rw/volume:/host/rw/volume:rw',
'/var/lib/docker/aaaaaaaa:/existing/volume:rw',
'existingvolume:/existing/volume:rw',
]
binds = merge_volume_bindings(options, intermediate_container)
self.assertEqual(set(binds), set(expected))
assert sorted(binds) == sorted(expected)
def test_mount_same_host_path_to_two_volumes(self):
service = Service(
@ -761,13 +761,14 @@ class ServiceVolumesTest(unittest.TestCase):
]),
)
def test_different_host_path_in_container_json(self):
def test_get_container_create_options_with_different_host_path_in_container_json(self):
service = Service(
'web',
image='busybox',
volumes=[VolumeSpec.parse('/host/path:/data')],
client=self.mock_client,
)
volume_name = 'abcdefff1234'
self.mock_client.inspect_image.return_value = {
'Id': 'ababab',
@ -788,7 +789,7 @@ class ServiceVolumesTest(unittest.TestCase):
'Mode': '',
'RW': True,
'Driver': 'local',
'Name': 'abcdefff1234'
'Name': volume_name,
},
]
}
@ -799,9 +800,9 @@ class ServiceVolumesTest(unittest.TestCase):
previous_container=Container(self.mock_client, {'Id': '123123123'}),
)
self.assertEqual(
self.mock_client.create_host_config.call_args[1]['binds'],
['/mnt/sda1/host/path:/data:rw'],
assert (
self.mock_client.create_host_config.call_args[1]['binds'] ==
['{}:/data:rw'.format(volume_name)]
)
def test_warn_on_masked_volume_no_warning_when_no_container_volumes(self):