Skip to content

Commit 494dc6c

Browse files
committed
bug fix: #1287 docker on alma9
1 parent e813d2c commit 494dc6c

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

dockerManager/decorators.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def wrap(request, *args, **kwargs):
4040

4141
try:
4242
client = docker.from_env()
43-
client.ping()
43+
result = client.ping()
4444
except BaseException as msg:
4545
logging.writeToFile(str(msg))
4646
if isPost:

plogical/processUtilities.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class ProcessUtilities(multi.Thread):
1515
OLS = 0
1616
centos = 1
1717
cent8 = 2
18+
cent9 = 3
1819
ubuntu = 0
1920
ubuntu20 = 3
2021
ubuntu22Check = 0
@@ -176,7 +177,9 @@ def decideDistro():
176177
return ProcessUtilities.ubuntu20
177178
return ProcessUtilities.ubuntu
178179
else:
179-
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:
180+
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 \
181+
or open('/etc/redhat-release', 'r').read().find('Rocky Linux release 8') > -1 \
182+
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:
180183
return ProcessUtilities.cent8
181184
return ProcessUtilities.centos
182185

plogical/test.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import docker
2+
3+
client = docker.from_env()
4+
print (client.ping())

0 commit comments

Comments
 (0)