diff --git a/dockerManager/decorators.py b/dockerManager/decorators.py index 13762d57e..f66184713 100755 --- a/dockerManager/decorators.py +++ b/dockerManager/decorators.py @@ -40,7 +40,7 @@ def preDockerRun(function): try: client = docker.from_env() - client.ping() + result = client.ping() except BaseException as msg: logging.writeToFile(str(msg)) if isPost: diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py index 9ff6bf81b..8995df590 100755 --- a/plogical/processUtilities.py +++ b/plogical/processUtilities.py @@ -15,6 +15,7 @@ class ProcessUtilities(multi.Thread): OLS = 0 centos = 1 cent8 = 2 + cent9 = 3 ubuntu = 0 ubuntu20 = 3 ubuntu22Check = 0 @@ -176,7 +177,9 @@ class ProcessUtilities(multi.Thread): return ProcessUtilities.ubuntu20 return ProcessUtilities.ubuntu else: - if open('/etc/redhat-release', 'r').read().find('CentOS Linux release 8') > -1 or open('/etc/redhat-release', 'r').read().find('AlmaLinux release 8') > -1 or open('/etc/redhat-release', 'r').read().find('Rocky Linux release 8') > -1: + if open('/etc/redhat-release', 'r').read().find('CentOS Linux release 8') > -1 or open('/etc/redhat-release', 'r').read().find('AlmaLinux release 8') > -1 \ + or open('/etc/redhat-release', 'r').read().find('Rocky Linux release 8') > -1 \ + or open('/etc/redhat-release', 'r').read().find('Rocky Linux release 9') > -1 or open('/etc/redhat-release', 'r').read().find('AlmaLinux release 9') > -1: return ProcessUtilities.cent8 return ProcessUtilities.centos diff --git a/plogical/test.py b/plogical/test.py index e69de29bb..f95c1eb65 100644 --- a/plogical/test.py +++ b/plogical/test.py @@ -0,0 +1,4 @@ +import docker + +client = docker.from_env() +print (client.ping()) \ No newline at end of file