Workaround for docker-py bug with macOS (#162)

mconcas · web-flow · commit dd84c1756cd6 · 2020-11-04T11:23:20.000+01:00
diff --git a/alidock/__init__.py b/alidock/__init__.py
@@ -89,7 +89,7 @@ def isRunning(self):
                 runStatus["image"] = runContainer.image.attrs["RepoTags"][0]
             except IndexError:
                 runStatus["image"] = runContainer.image.attrs["Id"]
-        except docker.errors.NotFound:
+        except (docker.errors.NotFound, requests.exceptions.ChunkedEncodingError):
             pass
         return runStatus
 
@@ -99,7 +99,7 @@ def getSshCommand(self):
         try:
             attrs = self.cli.containers.get(self.conf["dockName"]).attrs
             sshPort = attrs["NetworkSettings"]["Ports"]["22/tcp"][0]["HostPort"]
-        except (docker.errors.NotFound, KeyError) as exc:
+        except (docker.errors.NotFound, KeyError, requests.exceptions.ChunkedEncodingError) as exc:
             outLog = os.path.join(outPath, "log.txt")
             try:
                 with open(outLog, "a+"):
@@ -152,7 +152,7 @@ def shell(self, cmd=None):
         try:
             attrs = self.cli.containers.get(self.conf["dockName"]).attrs
             xPort = attrs["NetworkSettings"]["Ports"]["14500/tcp"][0]["HostPort"]
-        except (docker.errors.NotFound, KeyError):
+        except (docker.errors.NotFound, KeyError, requests.exceptions.ChunkedEncodingError):
             xPort = None
         if not xPort and platform.system() == "Windows" and "DISPLAY" not in os.environ:
             # On Windows if no DISPLAY environment is set we assume a sensible default
@@ -304,7 +304,7 @@ def run(self):
     def stop(self):
         try:
             self.cli.containers.get(self.conf["dockName"]).remove(force=True)
-        except docker.errors.NotFound:
+        except (docker.errors.NotFound, requests.exceptions.ChunkedEncodingError):
             pass  # final state is fine, container is gone
 
     def pull(self):
