From aa6756dd0c3e0dce955c39eab457acd80bf0c045 Mon Sep 17 00:00:00 2001 From: usmannasir <01-134132-158@student.bahria.edu.pk> Date: Tue, 5 Mar 2019 18:39:46 +0500 Subject: [PATCH] bug fix to docker images --- dockerManager/container.py | 17 ++++++++++------- plogical/backupUtilities.py | 1 - 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dockerManager/container.py b/dockerManager/container.py index 56691bfc4..42359b092 100644 --- a/dockerManager/container.py +++ b/dockerManager/container.py @@ -832,13 +832,16 @@ class ContainerManager(multi.Thread): names = [] for image in imageList: - name = image.attrs['RepoTags'][0].split(":")[0] - if name in names: - images[name]['tags'].extend(image.tags) - else: - names.append(name) - images[name] = {"name": name, - "tags": image.tags} + try: + name = image.attrs['RepoTags'][0].split(":")[0] + if name in names: + images[name]['tags'].extend(image.tags) + else: + names.append(name) + images[name] = {"name": name, + "tags": image.tags} + except: + continue return render(request, 'dockerManager/manageImages.html', {"images": images}) diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index c502d7b8f..5d6f94450 100644 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -695,7 +695,6 @@ class backupUtilities: 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"' - logging.CyberCPLogFileWriter.writeToFile(command) setupKeys = pexpect.spawn(command, timeout=3) index = setupKeys.expect(expectation)