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

Merge pull request #2351 from shin-/2322_config_hash_volumes_from

Browse source 
Update service config_dict computation to include volumes_from mode
This commit is contained in:
Daniel Nephin 2015-11-09 16:26:47 -05:00
commit e5fbf35ce1
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compose/service.py
View file

@ -502,7 +502,9 @@ class Service(object):
'image_id': self.image()['Id'], 'image_id': self.image()['Id'],
'links': self.get_link_names(), 'links': self.get_link_names(),
'net': self.net.id, 'net': self.net.id,
'volumes_from': self.get_volumes_from_names(), 'volumes_from': [
(v.source.name, v.mode) for v in self.volumes_from if isinstance(v.source, Service)
],
} }
def get_dependency_names(self): def get_dependency_names(self):

2
tests/unit/service_test.py
View file

@ -410,7 +410,7 @@ class ServiceTest(unittest.TestCase):
'options': {'image': 'example.com/foo'}, 'options': {'image': 'example.com/foo'},
'links': [('one', 'one')], 'links': [('one', 'one')],
'net': 'other', 'net': 'other',
'volumes_from': ['two'], 'volumes_from': [('two', 'rw')],
} }
self.assertEqual(config_dict, expected) self.assertEqual(config_dict, expected)