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

Constraint build argument types. Numbers are cast into strings

Browse source 
Numerical driver_opts are also valid and typecast into strings.
Additional config tests.

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-02-16 16:48:04 -08:00
commit 1952b52392
5 changed files with 72 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compose/config/config.py
View file

@ -16,6 +16,7 @@ from cached_property import cached_property
from ..const import COMPOSEFILE_V1 as V1
from ..const import COMPOSEFILE_V2_0 as V2_0
from ..utils import build_string_dict
from .errors import CircularReference
from .errors import ComposeFileNotFound
from .errors import ConfigurationError
@ -292,7 +293,7 @@ def load(config_details):
config_details = config_details._replace(config_files=processed_files)
main_file = config_details.config_files[0]
volumes = load_mapping(config_details.config_files, 'get_volumes', 'Volume')
volumes = load_volumes(config_details.config_files)
networks = load_mapping(config_details.config_files, 'get_networks', 'Network')
service_dicts = load_services(
config_details.working_dir,
@ -336,6 +337,14 @@ def load_mapping(config_files, get_func, entity_type):
return mapping
def load_volumes(config_files):
volumes = load_mapping(config_files, 'get_volumes', 'Volume')
for volume_name, volume in volumes.items():
if 'driver_opts' in volume:
volume['driver_opts'] = build_string_dict(volume['driver_opts'])
return volumes
def load_services(working_dir, config_file, service_configs):
def build_service(service_name, service_dict, service_names):
service_config = ServiceConfig.with_abs_paths(
@ -851,7 +860,7 @@ def normalize_build(service_dict, working_dir):
else:
build.update(service_dict['build'])
if 'args' in build:
build['args'] = resolve_build_args(build)
build['args'] = build_string_dict(resolve_build_args(build))
service_dict['build'] = build