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

If -x-networking is used, set the correct API version.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2015-10-14 12:09:50 -04:00
commit e2f792c4f4
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compose/cli/command.py
View file

@ -67,8 +67,8 @@ def get_config_path(file_option):
return [config_file] if config_file else None
def get_client(verbose=False):
client = docker_client()
def get_client(verbose=False, version=None):
client = docker_client(version=version)
if verbose:
version_info = six.iteritems(client.version())
log.info("Compose version %s", __version__)
@ -83,11 +83,12 @@ def get_project(base_dir, config_path=None, project_name=None, verbose=False,
use_networking=False, network_driver=None):
config_details = config.find(base_dir, config_path)
api_version = '1.21' if use_networking else None
try:
return Project.from_dicts(
get_project_name(config_details.working_dir, project_name),
config.load(config_details),
get_client(verbose=verbose),
get_client(verbose=verbose, version=api_version),
use_networking=use_networking,
network_driver=network_driver,
)