From e7cde3b2e5a7dd72ab8d0e3a3dde70715b7eba3e Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Fri, 12 Jan 2018 16:18:57 +0100 Subject: [PATCH] heat_docker: Require docker instead of docker-py docker-py was renamed to docker. Use docker with the version mentioned in global-requirements. Also docker.Client was renamed to docker.APIClient (see [1]). [1] https://docker-py.readthedocs.io/en/stable/change-log.html#breaking-changes Change-Id: I041727c1817c55be5265cc77d6ab9b5db5bf5dcf --- contrib/heat_docker/heat_docker/resources/docker_container.py | 4 ++-- contrib/heat_docker/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/heat_docker/heat_docker/resources/docker_container.py b/contrib/heat_docker/heat_docker/resources/docker_container.py index 3c0368b901..b21225da6d 100644 --- a/contrib/heat_docker/heat_docker/resources/docker_container.py +++ b/contrib/heat_docker/heat_docker/resources/docker_container.py @@ -332,9 +332,9 @@ class DockerContainer(resource.Resource): if DOCKER_INSTALLED: endpoint = self.properties.get(self.DOCKER_ENDPOINT) if endpoint: - client = docker.Client(endpoint) + client = docker.APIClient(endpoint) else: - client = docker.Client() + client = docker.APIClient() return client def _parse_networkinfo_ports(self, networkinfo): diff --git a/contrib/heat_docker/requirements.txt b/contrib/heat_docker/requirements.txt index ef8c263706..b72182632f 100644 --- a/contrib/heat_docker/requirements.txt +++ b/contrib/heat_docker/requirements.txt @@ -1 +1 @@ -docker-py>=0.2.2 +docker>=2.4.2 # Apache-2.0