diff --git a/plugins/docker/index.py b/plugins/docker/index.py index c7c5b5936..5d9be145e 100755 --- a/plugins/docker/index.py +++ b/plugins/docker/index.py @@ -282,20 +282,20 @@ def dockerLogin(): def repoList(): + path = getServerDir() repostory_info = [] user_file = path + '/user.json' if os.path.exists(user_file): user_info = mw.readFile(user_file) - if user_info: - user_info = json.loads(user_info) - for i in user_info: - tmp = {} - tmp["hub_name"] = i["hub_name"] - tmp["registry"] = i["registry"] - tmp["namespace"] = i["namespace"] - tmp['repository_name'] = i["repository_name"] - repostory_info.append(tmp) + user_info = json.loads(user_info) + for i in user_info: + tmp = {} + tmp["hub_name"] = i["hub_name"] + tmp["registry"] = i["registry"] + tmp["namespace"] = i["namespace"] + tmp['repository_name'] = i["repository_name"] + repostory_info.append(tmp) return mw.returnJson(True, 'ok', repostory_info) diff --git a/plugins/docker/js/docker.js b/plugins/docker/js/docker.js index 3e635e029..4fa41424c 100755 --- a/plugins/docker/js/docker.js +++ b/plugins/docker/js/docker.js @@ -242,7 +242,7 @@ function repoLogin(){ }); } }); - + } @@ -254,11 +254,10 @@ function repoList(){
\ \ \ - \ - \ - \ - \ - \ + \ + \ + \ + \ \ \ ' + '
名称版本大小证书描述NameRepository NameNameSpace地址操作
\ @@ -274,7 +273,7 @@ function repoList(){ repoLogin(); }); - dPost('image_list', '', {}, function(rdata){ + dPost('repo_list', '', {}, function(rdata){ var rdata = $.parseJSON(rdata.data); console.log(rdata); if (!rdata.status){ @@ -287,21 +286,11 @@ function repoList(){ for (var i = 0; i < rlist.length; i++) { - var tag = rlist[i]['RepoTags'].split(":")[1]; - - var license = 'null'; - var desc = 'null'; - - if (typeof(rlist[i]['Labels']) == 'null'){ - license = 'free'; - } - list += ''; - list += ''+rlist[i]['RepoTags']+''; - list += ''+tag+''; - list += ''+toSize(rlist[i]['Size'])+''; - list += ''+license+''; - list += ''+desc+''; + list += ''+rlist[i]['hub_name']+''; + list += ''+rlist[i]['repository_name']+''; + list += ''+rlist[i]['namespace']+''; + list += ''+rlist[i]['registry']+''; list += ''+'操作'+''; list += ''; }