diff options
| author | Joffrey F <joffrey@docker.com> | 2016-12-05 17:42:07 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-12-14 15:36:08 -0800 |
| commit | 04e5925a230d07a6ffd855b4c3812f5a6b54a523 (patch) | |
| tree | 1d347b45635a4fc4f689fdaa9081fae1c9d206b7 /compose | |
| parent | 635a28177781118f757df7dd8cdeeda89b1684cf (diff) | |
Use docker SDK 2.0
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'compose')
| -rw-r--r-- | compose/cli/docker_client.py | 4 | ||||
| -rw-r--r-- | compose/network.py | 8 | ||||
| -rw-r--r-- | compose/service.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py index b196d303..018d2451 100644 --- a/compose/cli/docker_client.py +++ b/compose/cli/docker_client.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import logging -from docker import Client +from docker import APIClient from docker.errors import TLSParameterError from docker.tls import TLSConfig from docker.utils import kwargs_from_env @@ -71,4 +71,4 @@ def docker_client(environment, version=None, tls_config=None, host=None, kwargs['user_agent'] = generate_user_agent() - return Client(**kwargs) + return APIClient(**kwargs) diff --git a/compose/network.py b/compose/network.py index 3b57cb94..8a29b73e 100644 --- a/compose/network.py +++ b/compose/network.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import logging from docker.errors import NotFound -from docker.utils import create_ipam_config -from docker.utils import create_ipam_pool +from docker.types import IPAMConfig +from docker.types import IPAMPool from .config import ConfigurationError @@ -96,10 +96,10 @@ def create_ipam_config_from_dict(ipam_dict): if not ipam_dict: return None - return create_ipam_config( + return IPAMConfig( driver=ipam_dict.get('driver'), pool_configs=[ - create_ipam_pool( + IPAMPool( subnet=config.get('subnet'), iprange=config.get('ip_range'), gateway=config.get('gateway'), diff --git a/compose/service.py b/compose/service.py index cf52d489..c32788fe 100644 --- a/compose/service.py +++ b/compose/service.py @@ -11,7 +11,7 @@ import enum import six from docker.errors import APIError from docker.errors import NotFound -from docker.utils import LogConfig +from docker.types import LogConfig from docker.utils.ports import build_port_bindings from docker.utils.ports import split_port |