make dev script compatible with newer python-docker as in 8b89c9943c1f

docker_dev_start.py

@@ -13,7 +13,7 @@
 
 import ConfigParser
 
-import docker  # apt python-docker (1.9)
+import docker  # apt python-docker (1.9) or pip install docker
 from psycopg2 import connect, OperationalError  # apt python-psycopg2
 from requests.exceptions import ConnectionError
 
@@ -17,6 +17,11 @@
 from psycopg2 import connect, OperationalError  # apt python-psycopg2
 from requests.exceptions import ConnectionError
 
+if docker.__version__ > '3.0.0':
+    from docker import APIClient as docker_api
+else:
+    from docker import Client as docker_api
+
 # TODO auto create list of module
 
 _logger = logging.getLogger(__name__)
@@ -241,7 +246,7 @@
         c.get('odoo_scripts', 'postgresql_version')) or '9.6'
     logging.debug("Docker image: %s", image)
     # detect if docker image already exists
-    docker_client = docker.Client(base_url='unix://var/run/docker.sock')
+    docker_client = docker_api(base_url='unix://var/run/docker.sock')
     image_list = docker_client.images(name=image, quiet=True)
     if not image_list:
         logging.warn("Image %s does not exist", image)