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

Match named volumes in service definitions with declared volumes

Browse source 
Raise ConfigurationError for undeclared named volumes
Test new behavior

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-01-21 18:03:58 -08:00 • committed by Aanand Prasad
commit a66bf72199
4 changed files with 118 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compose/config/types.py
View file

@ -163,3 +163,9 @@ class VolumeSpec(namedtuple('_VolumeSpec', 'external internal mode')):
def repr(self):
external = self.external + ':' if self.external else ''
return '{ext}{v.internal}:{v.mode}'.format(ext=external, v=self)
@property
def is_named_volume(self):
return self.external and not (
self.external.startswith('.') or self.external.startswith('/')
)

45
compose/project.py
View file

@ -74,6 +74,17 @@ class Project(object):
if 'default' not in network_config:
all_networks.append(project.default_network)
if config_data.volumes:
for vol_name, data in config_data.volumes.items():
project.volumes.append(
Volume(
client=client, project=name, name=vol_name,
driver=data.get('driver'),
driver_opts=data.get('driver_opts'),
external_name=data.get('external_name')
)
)
for service_dict in config_data.services:
if use_networking:
networks = get_networks(service_dict, all_networks)
@ -85,6 +96,9 @@ class Project(object):
links = project.get_links(service_dict)
volumes_from = get_volumes_from(project, service_dict)
if config_data.version == 2:
match_named_volumes(service_dict, project.volumes)
project.services.append(
Service(
client=client,
@ -94,23 +108,13 @@ class Project(object):
links=links,
net=net,
volumes_from=volumes_from,
**service_dict))
**service_dict)
)
project.networks += custom_networks
if 'default' not in network_config and project.uses_default_network():
project.networks.append(project.default_network)
if config_data.volumes:
for vol_name, data in config_data.volumes.items():
project.volumes.append(
Volume(
client=client, project=name, name=vol_name,
driver=data.get('driver'),
driver_opts=data.get('driver_opts'),
external_name=data.get('external_name')
)
)
return project
@property
@ -472,6 +476,23 @@ def get_networks(service_dict, network_definitions):
return networks
def match_named_volumes(service_dict, project_volumes):
for volume_spec in service_dict.get('volumes', []):
if volume_spec.is_named_volume:
declared_volume = next(
(v for v in project_volumes if v.name == volume_spec.external),
None
)
if not declared_volume:
raise ConfigurationError(
'Named volume "{0}" is used in service "{1}" but no'
' declaration was found in the volumes section.'.format(
volume_spec.repr(), service_dict.get('name')
)
)
volume_spec._replace(external=declared_volume.full_name)
def get_volumes_from(project, service_dict):
volumes_from = service_dict.pop('volumes_from', None)
if not volumes_from: