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

address PR feedback

Browse source 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-09-25 17:18:46 +01:00
commit 467c731869
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compose/project.py
View file

@ -37,7 +37,10 @@ def sort_service_dicts(services):
return [link.split(':')[0] for link in links]
def get_service_names_from_volumes_from(volumes_from):
return [volume_from.split(':')[0] for volume_from in volumes_from]
return [
parse_volume_from_spec(volume_from).source
for volume_from in volumes_from
]
def get_service_dependents(service_dict, services):
name = service_dict['name']
@ -195,7 +198,7 @@ class Project(object):
raise ConfigurationError(
'Service "%s" mounts volumes from "%s", which is '
'not the name of a service or container.' % (
volume_from_config,
service_dict['name'],
volume_from_spec.source))
volumes_from.append(volume_from_spec)
del service_dict['volumes_from']

5
compose/service.py
View file

@ -6,6 +6,7 @@ import os
import re
import sys
from collections import namedtuple
from operator import attrgetter
import enum
import six
@ -1009,10 +1010,6 @@ def parse_volume_from_spec(volume_from_config):
else:
source, mode = parts
if mode not in ('rw', 'ro'):
raise ConfigError("VolumeFrom %s has invalid mode (%s), should be "
"one of: rw, ro." % (volume_from_config, mode))
return VolumeFromSpec(source, mode)