From e9a41bd40cf7681b766f5e9a4ac773ddc9c41d07 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Fri, 15 Aug 2025 20:05:05 +0200
Subject: [PATCH] Added deletion of containers to reset routine

---
 roles/sys-svc-docker/tasks/01_core.yml        |  4 ++--
 roles/sys-svc-docker/tasks/02_reset.yml       | 20 +++++++++++++++++++
 .../tasks/{02_cleanup.yml => 03_cleanup.yml}  |  0
 roles/sys-svc-docker/tasks/03_reset.yml       |  4 ----
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 roles/sys-svc-docker/tasks/02_reset.yml
 rename roles/sys-svc-docker/tasks/{02_cleanup.yml => 03_cleanup.yml} (100%)
 delete mode 100644 roles/sys-svc-docker/tasks/03_reset.yml

diff --git a/roles/sys-svc-docker/tasks/01_core.yml b/roles/sys-svc-docker/tasks/01_core.yml
index 6db5026c..89a90d4e 100644
--- a/roles/sys-svc-docker/tasks/01_core.yml
+++ b/roles/sys-svc-docker/tasks/01_core.yml
@@ -7,11 +7,11 @@
   notify: docker restart
 
 - name: "Load cleanup tasks when MODE_CLEANUP or MODE_RESET is enabled"
-  include_tasks: "02_cleanup.yml"
+  include_tasks: "03_cleanup.yml"
   when: MODE_CLEANUP | bool or MODE_RESET | bool
 
 - name: "Load reset tasks when MODE_RESET is enabled"
-  include_tasks: "03_reset.yml"
+  include_tasks: "02_reset.yml"
   when: MODE_RESET | bool
 
 - name: Include backup, repair and health services for docker
diff --git a/roles/sys-svc-docker/tasks/02_reset.yml b/roles/sys-svc-docker/tasks/02_reset.yml
new file mode 100644
index 00000000..588432ec
--- /dev/null
+++ b/roles/sys-svc-docker/tasks/02_reset.yml
@@ -0,0 +1,20 @@
+- name: Gather containers
+  community.docker.docker_host_info:
+    containers: true
+  register: docker_info
+
+- name: Remove containers (stops running ones)
+  community.docker.docker_container:
+    name: "{{ (item.Names | default([item.Name]))[0] | regex_replace('^/','') }}"
+    state: absent
+    force_kill: true
+    remove_volumes: false # NEVER SET TO TRUE - PREVENTS DELETION OF VOLUMES
+  loop: "{{ docker_info.containers }}"
+  loop_control:
+    label: "{{ (item.Names | default([item.Name]))[0] }}"
+  when: docker_info.containers | length > 0
+
+- name: Trigger Docker restart
+  ansible.builtin.debug:
+    msg: "MODE_RESET is enabled → restarting Docker"
+  notify: Restart Docker
\ No newline at end of file
diff --git a/roles/sys-svc-docker/tasks/02_cleanup.yml b/roles/sys-svc-docker/tasks/03_cleanup.yml
similarity index 100%
rename from roles/sys-svc-docker/tasks/02_cleanup.yml
rename to roles/sys-svc-docker/tasks/03_cleanup.yml
diff --git a/roles/sys-svc-docker/tasks/03_reset.yml b/roles/sys-svc-docker/tasks/03_reset.yml
deleted file mode 100644
index e6023ae0..00000000
--- a/roles/sys-svc-docker/tasks/03_reset.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: Trigger Docker restart
-  ansible.builtin.debug:
-    msg: "MODE_RESET is enabled → restarting Docker"
-  notify: Restart Docker
\ No newline at end of file