docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't warn when the container volume is specified as a compose option. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-01-05 17:30:27 -05:00
parent 4017ea99fe
commit ad9011ed96
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/service.py
View File

@ -880,6 +880,7 @@ def warn_on_masked_volume(volumes_option, container_volumes, service):
for volume in volumes_option: for volume in volumes_option:
if ( if (
volume.external and
volume.internal in container_volumes and volume.internal in container_volumes and
container_volumes.get(volume.internal) != volume.external container_volumes.get(volume.internal) != volume.external
): ):

12
tests/unit/service_test.py
View File

@ -742,6 +742,18 @@ class ServiceVolumesTest(unittest.TestCase):
assert not mock_log.warn.called assert not mock_log.warn.called
def test_warn_on_masked_no_warning_with_container_only_option(self):
volumes_option = [VolumeSpec(None, '/path', 'rw')]
container_volumes = [
VolumeSpec('/var/lib/docker/volume/path', '/path', 'rw')
]
service = 'service_name'
with mock.patch('compose.service.log', autospec=True) as mock_log:
warn_on_masked_volume(volumes_option, container_volumes, service)
assert not mock_log.warn.called
def test_create_with_special_volume_mode(self): def test_create_with_special_volume_mode(self):
self.mock_client.inspect_image.return_value = {'Id': 'imageid'} self.mock_client.inspect_image.return_value = {'Id': 'imageid'}