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

Merge pull request #3653 from shin-/3637-link-local-ips

Browse source 
Add support for link-local IPs in service.networks definition
This commit is contained in:
Joffrey F 2016-09-22 11:58:29 -07:00 • committed by GitHub
commit f65f89ad8c
10 changed files with 464 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compose/config/config.py
View file

@ -14,6 +14,7 @@ from cached_property import cached_property
from ..const import COMPOSEFILE_V1 as V1
from ..const import COMPOSEFILE_V2_0 as V2_0
from ..const import COMPOSEFILE_V2_1 as V2_1
from ..utils import build_string_dict
from ..utils import splitdrive
from .environment import env_vars_from_file
@ -174,7 +175,7 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')):
if version == '2':
version = V2_0
if version != V2_0:
if version not in (V2_0, V2_1):
raise ConfigurationError(
'Version in "{}" is unsupported. {}'
.format(self.filename, VERSION_EXPLANATION))
@ -424,7 +425,7 @@ def process_config_file(config_file, environment, service_name=None):
'service',
environment,)
if config_file.version == V2_0:
if config_file.version in (V2_0, V2_1):
processed_config = dict(config_file.config)
processed_config['services'] = services
processed_config['volumes'] = interpolate_config_section(