update

plugins/docker/index.py

@@ -226,6 +226,27 @@ def imageListData():
     return mw.returnJson(True, 'ok', ilist)
 
 
+def dockerRemoveImage():
+    args = getArgs()
+    data = checkArgs(args, ['imageId', 'repoTags'])
+    if not data[0]:
+        return data[1]
+
+    repoTags = args['repoTags']
+    imageId = args['imageId']
+
+    c = getDClient()
+    try:
+        c.images.remove(repoTags)
+        return mw.returnJson(True, '成功删除')
+    except:
+        try:
+            c.images.remove(imageId)
+            return mw.returnJson(True, '成功删除!')
+        except docker.errors.APIError as ex:
+            return mw.returnJson(False, '删除失败, 当前镜像正在使用!')
+
+
 def dockerLoginCheck(user_name, user_pass, registry):
     # 登陆验证
     cmd = 'docker login -u=%s -p %s %s' % (user_name, user_pass, registry)
@@ -359,6 +380,8 @@ if __name__ == "__main__":
         print(conListData())
     elif func == 'image_list':
         print(imageListData())
+    elif func == 'docker_remove_image':
+        print(dockerRemoveImage())
     elif func == 'docker_login':
         print(dockerLogin())
     elif func == 'docker_logout':

plugins/docker/info.json

@@ -13,6 +13,7 @@
 	"author": "Zend",
 	"date": "2017-04-01",
 	"home": "https://docker.io",
+	"doc1":"https://docker-py.readthedocs.io/",
 	"type": 0,
 	"pid": "2"
 }

plugins/docker/js/docker.js

@@ -97,13 +97,18 @@ function dockerConList(){
                 status = '<span class="glyphicon glyphicon-play" style="color:#20a53a;font-size:12px"></span>';
             }
 
+            var op = '';
+            op += '<a href="javascript:;" onclick="pullImages(\''+rlist[i]['RepoTags']+'\',\''+rlist[i]['Id']+'\')" class="btlink">终端</a> | ';
+            op += '<a href="javascript:;" onclick="pullImages(\''+rlist[i]['RepoTags']+'\',\''+rlist[i]['Id']+'\')" class="btlink">日志</a> | ';
+            op += '<a href="javascript:;" onclick="deleteImages(\''+rlist[i]['RepoTags']+'\',\''+rlist[i]['Id']+'\')" class="btlink">删除</a>';
+
 
             list += '<tr>';
             list += '<td>'+rlist[i]['Name'].substring(1)+'</td>';
             list += '<td>'+rlist[i]['Config']['Image']+'</td>';
-            list += '<td>'+rlist[i]['Created']+'</td>';
+            list += '<td>'+getFormatTime(rlist[i]['Created'])+'</td>';
             list += '<td>'+status+'</td>';
-            list += '<td>'+'操作'+'</td>';
+            list += '<td class="text-right">'+op+'</td>';
             list += '</tr>';
         }
 
@@ -112,29 +117,25 @@ function dockerConList(){
     
 }
 
-function dockerImageList(){
+function deleteImages(tag, id){
-
+    safeMessage('删除镜像','删除镜像['+tag+'],确定？',function(){
-    var con = '<div class="safe bgw">\
+        dPost('docker_remove_image','', {imageId:id,repoTags:tag},function(rdata){
-            <button onclick="" title="" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">获取镜像</button>\
+            var rdata = $.parseJSON(rdata.data);
-            <div class="divtable mtb10">\
+            showMsg(rdata.msg,function(){
-                <div class="tablescroll">\
+                if(rdata.status) {
-                    <table id="con_list" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    dockerImageListRender();
-                    <thead><tr>\
+                }
-                    <th>名称</th>\
+            },{ icon: rdata.status ? 1 : 2 });
-                    <th>版本</th>\
+        });
-                    <th>大小</th>\
+    });
-                    <th>证书</th>\
+}
-                    <th>描述</th>\
-                    <th style="text-align:right;">操作</th></tr></thead>\
-                    <tbody>\
-                    ' + '</tbody></table>\
-                </div>\
-                <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
-            </div>\
-        </div>';
 
-    $(".soft-man-con").html(con);
+function pullImages(tag, id){
+    console.log(tag, id);
+    layer.msg('开发中!',{ icon: 2 });
+}
 
+function dockerImageListRender(){
     dPost('image_list', '', {}, function(rdata){
         var rdata = $.parseJSON(rdata.data);
         console.log(rdata);
@@ -152,24 +153,51 @@ function dockerImageList(){
 
             var license = 'null';
             var desc = 'null';
-
+            if (rlist[i]['Labels'] == null){
-            if (typeof(rlist[i]['Labels']) == 'null'){
                 license = 'free';
             }
 
+            var op = '';
+            op += '<a href="javascript:;" onclick="pullImages(\''+rlist[i]['RepoTags']+'\',\''+rlist[i]['Id']+'\')" class="btlink">拉取</a> | ';
+            op += '<a href="javascript:;" onclick="deleteImages(\''+rlist[i]['RepoTags']+'\',\''+rlist[i]['Id']+'\')" class="btlink">删除</a>';
+
             list += '<tr>';
             list += '<td>'+rlist[i]['RepoTags']+'</td>';
             list += '<td>'+tag+'</td>';
             list += '<td>'+toSize(rlist[i]['Size'])+'</td>';
             list += '<td>'+license+'</td>';
             list += '<td>'+desc+'</td>';
-            list += '<td>'+'操作'+'</td>';
+            list += '<td class="text-right">'+op+'</td>';
             list += '</tr>';
         }
 
         $('#con_list tbody').html(list);
     });
-    
+}
+
+function dockerImageList(){
+
+    var con = '<div class="safe bgw">\
+            <button onclick="" title="" class="btn btn-success btn-sm" type="button" style="margin-right: 5px;">获取镜像</button>\
+            <div class="divtable mtb10">\
+                <div class="tablescroll">\
+                    <table id="con_list" class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0" style="border: 0 none;">\
+                    <thead><tr>\
+                    <th>名称</th>\
+                    <th>版本</th>\
+                    <th>大小</th>\
+                    <th>证书</th>\
+                    <th>描述</th>\
+                    <th style="text-align:right;">操作</th></tr></thead>\
+                    <tbody></tbody></table>\
+                </div>\
+                <div id="databasePage" class="dataTables_paginate paging_bootstrap page"></div>\
+            </div>\
+        </div>';
+
+    $(".soft-man-con").html(con);
+
+    dockerImageListRender();
 }
 
 // login
@@ -281,7 +309,7 @@ function repoListRender(){
             list += '<td>'+rlist[i]['repository_name']+'</td>';
             list += '<td>'+rlist[i]['namespace']+'</td>';
             list += '<td>'+rlist[i]['registry']+'</td>';
-            list += '<td><a href="javascript:;" onclick="delRepo(\''+rlist[i]['registry']+'\')" class="btlink">删除</a></td>';
+            list += '<td class="text-right"><a href="javascript:;" onclick="delRepo(\''+rlist[i]['registry']+'\')" class="btlink">删除</a></td>';
             list += '</tr>';
         }
 

plugins/mysql/js/mysql.js

@@ -181,7 +181,7 @@ function changeMySQLDataPath(act) {
     $.post('/database?action=GetMySQLInfo', '', function(rdata) {
         var LimitCon = '<p class="conf_p">\
                             <input id="datadir" class="phpUploadLimit bt-input-text mr5" style="width:350px;" type="text" value="' + rdata.datadir + '" name="datadir">\
-                            <span onclick="ChangePath(\'datadir\')" class="glyphicon glyphicon-folder-open cursor mr20" style="width:auto"></span><button class="btn btn-success btn-sm" onclick="changeMySQLDataPath(1)">' + lan.soft.mysql_to + '</button>\
+                            <span onclick="changePath(\'datadir\')" class="glyphicon glyphicon-folder-open cursor mr20" style="width:auto"></span><button class="btn btn-success btn-sm" onclick="changeMySQLDataPath(1)">' + lan.soft.mysql_to + '</button>\
                         </p>';
         $(".soft-man-con").html(LimitCon);
     });