openstack
/
solum
Code Issues Proposed changes

Upgrade from docker-py to docker 

The pypi package 'docker-py' [1] has been renamed to 'docker' [2].
It is better to move to the new 'docker' package because the old
package will be deprecated and all the new features will go into
the new package only.

Package 'docker' has been added to requirements [3]. The old
package 'docker-py' is still allowed to be in the global requirements
during the transition period but it should be removed after all or
most of the projects finsih the migration.

[1] https://pypi.python.org/pypi/docker-py
[2] https://pypi.python.org/pypi/docker
[3] https://review.openstack.org/#/c/423715/

Change-Id: Ib3556c047353d11bcce966d549267b08024435a2
This commit is contained in:
Hongbin Lu 2017-06-20 22:05:17 +00:00
parent e66f4eec29
commit 7baee17796
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -4,7 +4,7 @@
eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
alembic>=0.8.10 # MIT
Babel!=2.4.0,>=2.3.4 # BSD
docker-py>=1.8.1 # Apache-2.0
docker>=2.0.0 # Apache-2.0
httplib2>=0.7.5 # MIT
iso8601>=0.1.11 # MIT
kombu!=4.0.2,>=4.0.0 # BSD

2
solum/worker/app_handlers/base.py
View File

@ -77,7 +77,7 @@ class BaseHandler(object):
@property
def docker(self):
if self._docker is None:
self._docker = docker.Client(base_url=docker_daemon_url)
self._docker = docker.APIClient(base_url=docker_daemon_url)
return self._docker
def _get_tenant_logger(self, stage):