feat: Swarm cleaner now also cleans up dangling services

dataplatform/images/docker-cleaner/Dockerfile

@@ -1,10 +1,13 @@
-FROM centos:centos7
+FROM docker:stable
+
+# Install bash
+RUN apk add --no-cache bash
 
-# Install Docker
-RUN yum install -y docker
 # Run the script
 ADD commands.sh /usr/local/bin/shell.sh
 
 RUN chmod 777 /usr/local/bin/shell.sh
 
-CMD /usr/local/bin/shell.sh
+CMD ["bash", "/usr/local/bin/shell.sh"]
+
+

dataplatform/images/docker-cleaner/commands.sh

@@ -8,4 +8,16 @@ docker image prune -f
 
 echo "Removing cache..."
 docker builder prune -f
-echo "Docker cleanup complete."
+echo "Docker cleanup complete."
+
+
+echo "Cleaning up old services left around the Swarm..."
+
+docker service ls --format "{{.ID}} {{.Replicas}}" | while read service_id replicas; do
+  # Check if the replication factor starts with 0 (i.e., 0/x)
+  if [[ "$replicas" =~ ^0/ ]]; then
+    echo "Removing service: $service_id"
+    docker service rm $service_id
+  fi
+done
+echo "Succesfully cleaned Swarm services"

dataplatform/images/docker-cleaner/docker-cleaner-dag.py

@@ -31,6 +31,6 @@
     volumes=['/var/run/docker.sock:/var/run/docker.sock'],
     mount_tmp_dir=False,
     mode=ServiceMode('global'),
-	placement=Placement(constraints=['node.hostname != CB-Mass-Node1']),
+	placement=Placement(constraints=['node.hostname != CB-Mass-Node1', 'node.role == manager']),
     xcom_all=True, # Enable XCom push for this task
-)
+)