From 5e15de0394e63bc09b1085fb4e9d77cfb50a0fbd Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 22 Jan 2023 21:38:43 +0100 Subject: [PATCH] Use shared filter --- lib/mrsk/commands/accessory.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/mrsk/commands/accessory.rb b/lib/mrsk/commands/accessory.rb index c4c7c7c2..cf828de1 100644 --- a/lib/mrsk/commands/accessory.rb +++ b/lib/mrsk/commands/accessory.rb @@ -30,7 +30,7 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base end def info - docker :ps, "--filter", "name=#{service_name}" + docker :ps, *service_filter end def logs(since: nil, lines: nil, grep: nil) @@ -47,10 +47,15 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base end def remove_container - docker :container, :prune, "-f", "--filter", "label=name=#{service_name}" + docker :container, :prune, "-f", *service_filter end def remove_image - docker :image, :prune, "-a", "-f", "--filter", "label=name=#{service_name}" + docker :image, :prune, "-a", "-f", *service_filter end + + private + def service_filter + [ "--filter", "label=service=#{service_name}" ] + end end