pull/420/head
midoks 2 years ago
parent 6aa49ddbcf
commit f7b1159bd7
  1. 1
      README.md
  2. 37
      plugins/docker/index.py
  3. 16
      plugins/docker/js/docker.js

@ -105,6 +105,7 @@ docker run -itd --name mw-server --privileged=true -p 7200:7200 -p 80:80 -p 443:
* 添加nezha插件。 * 添加nezha插件。
* 优化域名ssl保存功能。 * 优化域名ssl保存功能。
* 修复PHP扩展intl不加载问题(debian/ubuntu)。 * 修复PHP扩展intl不加载问题(debian/ubuntu)。
* 修复redhat安装openresty缺少openssl-devel。
### JSDelivr安装地址 ### JSDelivr安装地址

@ -281,6 +281,41 @@ def dockerLogin():
return mw.returnJson(False, '登录失败!') 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(): def repoList():
path = getServerDir() path = getServerDir()
repostory_info = [] repostory_info = []
@ -326,6 +361,8 @@ if __name__ == "__main__":
print(imageListData()) print(imageListData())
elif func == 'docker_login': elif func == 'docker_login':
print(dockerLogin()) print(dockerLogin())
elif func == 'docker_logout':
print(dockerLogout())
elif func == 'repo_list': elif func == 'repo_list':
print(repoList()) print(repoList())
else: else:

@ -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(){ function repoList(){
var con = '<div class="safe bgw">\ var con = '<div class="safe bgw">\
@ -291,7 +305,7 @@ function repoList(){
list += '<td>'+rlist[i]['repository_name']+'</td>'; list += '<td>'+rlist[i]['repository_name']+'</td>';
list += '<td>'+rlist[i]['namespace']+'</td>'; list += '<td>'+rlist[i]['namespace']+'</td>';
list += '<td>'+rlist[i]['registry']+'</td>'; list += '<td>'+rlist[i]['registry']+'</td>';
list += '<td>'+'操作'+'</td>'; list += '<td><a href="javascript:;" onclick="docker.logout_aliyun(\''+rlist[i]['registry']+'\')" class="btlink">删除</a></td>';
list += '</tr>'; list += '</tr>';
} }

Loading…
Cancel
Save