u

plugins/docker/index.py

@@ -10,13 +10,22 @@ sys.path.append(os.getcwd() + "/class/core")
 import mw
 
 import docker
-client = docker.from_env()
+
 
 app_debug = False
 if mw.isAppleSystem():
     app_debug = True
 
 
+def getDClient():
+    try:
+        client = docker.from_env()
+    except Exception as e:
+        client = docker.DockerClient(
+            base_url='unix:///Users/midoks/.docker/run/docker.sock')
+    return client
+
+
 def getPluginName():
     return 'docker'
 
@@ -29,12 +38,6 @@ def getServerDir():
     return mw.getServerDir() + '/' + getPluginName()
 
 
-def getInitDFile():
-    if app_debug:
-        return '/tmp/' + getPluginName()
-    return '/etc/init.d/' + getPluginName()
-
-
 def getConf():
     path = getServerDir() + "/redis.conf"
     return path
@@ -60,19 +63,19 @@ def getArgs():
         if t.strip() == '':
             tmp = []
         else:
-            t = t.split(':')
+            t = t.split(':', 1)
             tmp[t[0]] = t[1]
         tmp[t[0]] = t[1]
     elif args_len > 1:
         for i in range(len(args)):
-            t = args[i].split(':')
+            t = args[i].split(':', 1)
             tmp[t[0]] = t[1]
     return tmp
 
 
 def status():
     data = mw.execShell(
-        "ps -ef|grep dockerd |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
+        "ps -ef|grep docker |grep -v grep | grep -v python | grep -v mdserver-web | awk '{print $2}'")
 
     if data[0] == '':
         return 'stop'
@@ -143,6 +146,12 @@ def initdUinstall():
 
 
 def conList():
+
+    c = getDClient()
+
+    clist = c.containers.list(all=True)
+
+    print(clist)
     return mw.returnJson(True, 'ok')
 
 

plugins/docker/js/docker.js

@@ -61,7 +61,7 @@ function dockerList(){
     });
 
     var con = '<div class="safe bgw">\
-            <button onclick="" title="" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">添加数据库</button>\
+            <button onclick="" title="" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">创建容器</button>\
             <span style="float:right">              \
                 <button batch="true" style="float: right;display: none;margin-left:10px;" onclick="delDbBatch();" title="删除选中项" class="btn btn-default btn-sm">删除选中</button>\
             </span>\