From f7b1159bd776800d903314b2ce2c67d02060ec90 Mon Sep 17 00:00:00 2001 From: midoks Date: Sat, 1 Jul 2023 12:15:51 +0800 Subject: [PATCH] update --- README.md | 1 + plugins/docker/index.py | 37 +++++++++++++++++++++++++++++++++++++ plugins/docker/js/docker.js | 18 ++++++++++++++++-- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 55d22c76f..41d909ce2 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443: * 添加nezha插件。 * 优化域名ssl保存功能。 * 修复PHP扩展intl不加载问题(debian/ubuntu)。 +* 修复redhat安装openresty缺少openssl-devel。 ### JSDelivr安装地址 diff --git a/plugins/docker/index.py b/plugins/docker/index.py index b21f345d8..65771abf6 100755 --- a/plugins/docker/index.py +++ b/plugins/docker/index.py @@ -281,6 +281,41 @@ def dockerLogin(): return mw.returnJson(False, '登录失败!') +# 删除用户信息 +def delete_user_info(registry): + path = getServerDir() + user_file = path + '/user.json' + user_info = mw.readFile(user_file) + if user_info: + user_info = json.loads(user_info) + for i in range(len(user_info)): + if registry in user_info[i].values(): + del(user_info[i]) + mw.writeFile(user_file, json.dumps(user_info)) + return True + + +def dockerLogout(): + args = getArgs() + data = checkArgs(args, ['registry']) + if not data[0]: + return data[1] + + registry = args['registry'] + if registry == "docker.io": + registry = "" + login_test = mw.execShell('docker logout %s' % get.registry) + if registry == "": + registry = "docker.io" + ret = 'required$|Error' + ret2 = re.findall(ret, login_test[-1]) + delete_user_info(registry) + if len(ret2) == 0: + return mw.returnJson(True, '退出成功') + else: + return mw.returnJson(True, '退出失败') + + def repoList(): path = getServerDir() repostory_info = [] @@ -326,6 +361,8 @@ if __name__ == "__main__": print(imageListData()) elif func == 'docker_login': print(dockerLogin()) + elif func == 'docker_logout': + print(dockerLogout()) elif func == 'repo_list': print(repoList()) else: diff --git a/plugins/docker/js/docker.js b/plugins/docker/js/docker.js index 4fa41424c..045afe087 100755 --- a/plugins/docker/js/docker.js +++ b/plugins/docker/js/docker.js @@ -246,6 +246,20 @@ function repoLogin(){ } +function delRepo(){ + safeMessage('退出','你将退出 ['+address+'],确定?',function(){ + dPost('docker_logout', '', + {registry:address}, + function(rdata){ + var rdata = $.parseJSON(rdata.data); + layer.msg(rdata.msg,{icon:rdata.status?1:2}); + if(rdata.status) { + docker.get_repository_list(); + } + }); + }); +} + function repoList(){ var con = '
\ @@ -285,13 +299,13 @@ function repoList(){ var rlist = rdata.data; for (var i = 0; i < rlist.length; i++) { - + list += ''; list += ''+rlist[i]['hub_name']+''; list += ''+rlist[i]['repository_name']+''; list += ''+rlist[i]['namespace']+''; list += ''+rlist[i]['registry']+''; - list += ''+'操作'+''; + list += '删除'; list += ''; }