openstack/heat
Code Issues Proposed changes

heat_docker: Require docker instead of docker-py

Browse Source 
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
This commit is contained in:
Thomas Bechtold 2018-01-12 16:18:57 +01:00
parent 81d55b2d68
commit e7cde3b2e5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/heat_docker/heat_docker/resources/docker_container.py
View File

@ -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):

2
contrib/heat_docker/requirements.txt
View File

@ -1 +1 @@
docker-py>=0.2.2
docker>=2.4.2 # Apache-2.0