Merge branch 'develop' of https://github.com/nicolargo/glances into develop

1 files changed, 8 insertions, 2 deletions

diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py
index 34300750..a90c073d 100644
--- a/glances/plugins/glances_docker.py
+++ b/glances/plugins/glances_docker.py
@@ -29,6 +29,8 @@ from glances.logger import logger
 from glances.timer import getTimeSinceLastUpdate
 from glances.plugins.glances_plugin import GlancesPlugin
 
+from glances.globals import WINDOWS
+
 # Docker-py library (optional and Linux-only)
 # https://github.com/docker/docker-py
 try:
@@ -109,10 +111,14 @@ class Plugin(GlancesPlugin):
             return None
         # Init connection to the Docker API
         try:
+            if WINDOWS:
+                url = 'npipe:////./pipe/docker_engine'
+            else:
+                url = 'unix://var/run/docker.sock'
             if version is None:
-                ret = init_docker(base_url='unix://var/run/docker.sock')
+                ret = init_docker(base_url=url)
             else:
-                ret = init_docker(base_url='unix://var/run/docker.sock',
+                ret = init_docker(base_url=url,
                                   version=version)
         except NameError:
             # docker lib not found