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

Merge pull request #313 from orchardup/fix-volumes-from-container

Browse source 
Fix volumes_from container
This commit is contained in:
Ben Firshman 2014-07-12 01:10:45 +01:00
commit dd5c2e8767
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fig/project.py
View file

@ -135,8 +135,8 @@ class Project(object):
volumes_from.append(service)
except NoSuchService:
try:
container = Container.from_id(client, volume_name)
volumes_from.append(Container.from_id(client, volume_name))
container = Container.from_id(self.client, volume_name)
volumes_from.append(container)
except APIError:
raise ConfigurationError('Service "%s" mounts volumes from "%s", which is not the name of a service or container.' % (service_dict['name'], volume_name))
del service_dict['volumes_from']