From 9e7ce59b85eca396331a166a981f30c41b0c5f08 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 8 Jan 2023 12:08:28 +0100
Subject: [PATCH] Use a shared prune

---
 lib/tasks/mrsk/images.rake | 10 ----------
 lib/tasks/mrsk/prune.rake  | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 lib/tasks/mrsk/images.rake
 create mode 100644 lib/tasks/mrsk/prune.rake

diff --git a/lib/tasks/mrsk/images.rake b/lib/tasks/mrsk/images.rake
deleted file mode 100644
index a03e5bdd..00000000
--- a/lib/tasks/mrsk/images.rake
+++ /dev/null
@@ -1,10 +0,0 @@
-require_relative "setup"
-
-namespace :mrsk do
-  namespace :images do
-    desc "Prune unused images older than 30 days"
-    task :prune do
-      on(MRSK_CONFIG.servers) { execute "docker image prune -f --filter 'until=720h'" }
-    end
-  end
-end
diff --git a/lib/tasks/mrsk/prune.rake b/lib/tasks/mrsk/prune.rake
new file mode 100644
index 00000000..5fe85214
--- /dev/null
+++ b/lib/tasks/mrsk/prune.rake
@@ -0,0 +1,18 @@
+require_relative "setup"
+
+namespace :mrsk do
+  desc "Prune unused images and stopped containers"
+  task prune: [ "prune:images", "prune:containers" ]
+
+  namespace :prune do
+    desc "Prune unused images older than 30 days"
+    task :images do
+      on(MRSK_CONFIG.servers) { execute "docker image prune -f --filter 'until=720h'" }
+    end
+
+    desc "Prune stopped containers for the service older than 3 days"
+    task :containers do
+      on(MRSK_CONFIG.servers) { execute "docker container prune -f --filter label=service=#{MRSK_CONFIG.service} --filter 'until=72h'" }
+    end
+  end
+end