Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-10 15:26:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix to docker images

Browse Source
This commit is contained in:
usmannasir
2019-03-05 18:39:46 +05:00
parent eff5a7c242
commit aa6756dd0c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dockerManager/container.py
View File

@@ -832,13 +832,16 @@ class ContainerManager(multi.Thread):
names = [] names = []
for image in imageList: for image in imageList:
name = image.attrs['RepoTags'][0].split(":")[0] try:
if name in names: name = image.attrs['RepoTags'][0].split(":")[0]
images[name]['tags'].extend(image.tags) if name in names:
else: images[name]['tags'].extend(image.tags)
names.append(name) else:
images[name] = {"name": name, names.append(name)
"tags": image.tags} images[name] = {"name": name,
"tags": image.tags}
except:
continue
return render(request, 'dockerManager/manageImages.html', {"images": images}) return render(request, 'dockerManager/manageImages.html', {"images": images})

1
plogical/backupUtilities.py
View File

@@ -695,7 +695,6 @@ class backupUtilities:
expectation.append("Permission denied") expectation.append("Permission denied")
command = "ssh -o StrictHostKeyChecking=no -p "+ port +" root@"+IPAddress+' "mkdir /root/.ssh || rm -f /root/.ssh/temp && rm -f /root/.ssh/authorized_temp && cp /root/.ssh/authorized_keys /root/.ssh/temp"' command = "ssh -o StrictHostKeyChecking=no -p "+ port +" root@"+IPAddress+' "mkdir /root/.ssh || rm -f /root/.ssh/temp && rm -f /root/.ssh/authorized_temp && cp /root/.ssh/authorized_keys /root/.ssh/temp"'
logging.CyberCPLogFileWriter.writeToFile(command)
setupKeys = pexpect.spawn(command, timeout=3) setupKeys = pexpect.spawn(command, timeout=3)
index = setupKeys.expect(expectation) index = setupKeys.expect(expectation)