update filter

usmannasir · Jan 5, 2024 · b9f9438 · b9f9438
1 parent 3029e2e
commit b9f9438
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/plogical/DockerSites.py b/plogical/DockerSites.py
@@ -30,6 +30,14 @@ def __init__(self, function_run, data):
             self.JobID = self.data['JobID']  ##JOBID will be file path where status is being written
         except:
             pass
+        try:
+            ### set docker name for listing/deleting etc
+            if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
+                self.DockerAppName = f"{self.data['name'].replace(' ', '')}-{self.data['name'].replace(' ', '-')}"
+            else:
+                self.DockerAppName = f"{self.data['name'].replace(' ', '')}_{self.data['name'].replace(' ', '-')}"
+        except:
+            pass
 
     def run(self):
         try:
@@ -488,7 +496,7 @@ def DeleteDockerApp(self):
             # Create a Docker client
             client = docker.from_env()
 
-            FilerValue = f"{self.data['name'].replace(' ', '')}_{self.data['name'].replace(' ', '-')}"
+            FilerValue = self.DockerAppName
 
             # Define the label to filter containers
             label_filter = {'name': FilerValue}
@@ -522,7 +530,7 @@ def ListContainers(self):
             # Create a Docker client
             client = docker.from_env()
 
-            FilerValue = f"{self.data['name'].replace(' ', '')}_{self.data['name'].replace(' ', '-')}"
+            FilerValue = self.DockerAppName
 
             # Define the label to filter containers
             label_filter = {'name': FilerValue}