From 94d61f3d9a68cb0bd5d86a0e4350da0ba5e0f42e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 8 Jan 2023 16:32:31 +0100 Subject: [PATCH] Proper param array separation --- lib/mrsk/commands/app.rb | 12 ++++++------ lib/mrsk/commands/traefik.rb | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb index b072c862..b9bc9e16 100644 --- a/lib/mrsk/commands/app.rb +++ b/lib/mrsk/commands/app.rb @@ -25,27 +25,27 @@ class Mrsk::Commands::App < Mrsk::Commands::Base end def stop - [ "docker ps -q #{service_filter} | xargs docker stop" ] + [ "docker ps -q #{service_filter.join(" ")} | xargs docker stop" ] end def info - docker :ps, service_filter + docker :ps, *service_filter end def logs - [ "docker ps -q #{service_filter} | xargs docker logs -f" ] + [ "docker ps -q #{service_filter.join(" ")} | xargs docker logs -f" ] end def remove_containers - docker :container, :prune, "-f", service_filter + docker :container, :prune, "-f", *service_filter end def remove_images - docker :image, :prune, "-a", "-f", service_filter + docker :image, :prune, "-a", "-f", *service_filter end private def service_filter - "--filter label=service=#{config.service}" + [ "--filter", "label=service=#{config.service}" ] end end diff --git a/lib/mrsk/commands/traefik.rb b/lib/mrsk/commands/traefik.rb index 47cfe3cd..5512341a 100644 --- a/lib/mrsk/commands/traefik.rb +++ b/lib/mrsk/commands/traefik.rb @@ -18,7 +18,7 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base end def info - docker :ps, "--filter name=traefik" + docker :ps, "--filter", "name=traefik" end def logs @@ -26,10 +26,10 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base end def remove_container - docker :container, :prune, "-f", "--filter label=org.opencontainers.image.title=Traefik" + docker :container, :prune, "-f", "--filter", "label=org.opencontainers.image.title=Traefik" end def remove_image - docker :image, :prune, "-a", "-f", "--filter label=org.opencontainers.image.title=Traefik" + docker :image, :prune, "-a", "-f", "--filter", "label=org.opencontainers.image.title=Traefik" end end