diff --git a/lib/mrsk/commands/accessory.rb b/lib/mrsk/commands/accessory.rb index 76d4fa96..2f745267 100644 --- a/lib/mrsk/commands/accessory.rb +++ b/lib/mrsk/commands/accessory.rb @@ -100,7 +100,7 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base end def remove_image - docker :image, :prune, "--all", "--force", *service_filter + docker :image, :rm, "--force", image end private diff --git a/test/cli/accessory_test.rb b/test/cli/accessory_test.rb index 8d2fe435..b9833b89 100644 --- a/test/cli/accessory_test.rb +++ b/test/cli/accessory_test.rb @@ -126,7 +126,7 @@ class CliAccessoryTest < CliTestCase end test "remove_image" do - assert_match "docker image prune --all --force --filter label=service=app-mysql", run_command("remove_image", "mysql") + assert_match "docker image rm --force mysql", run_command("remove_image", "mysql") end test "remove_service_directory" do diff --git a/test/cli/main_test.rb b/test/cli/main_test.rb index 0b2ff2c1..d4aa3d82 100644 --- a/test/cli/main_test.rb +++ b/test/cli/main_test.rb @@ -235,12 +235,12 @@ class CliMainTest < CliTestCase assert_match /docker container stop app-mysql/, output assert_match /docker container prune --force --filter label=service=app-mysql/, output - assert_match /docker image prune --all --force --filter label=service=app-mysql/, output + assert_match /docker image rm --force mysql/, output assert_match /rm -rf app-mysql/, output assert_match /docker container stop app-redis/, output assert_match /docker container prune --force --filter label=service=app-redis/, output - assert_match /docker image prune --all --force --filter label=service=app-redis/, output + assert_match /docker image rm --force redis/, output assert_match /rm -rf app-redis/, output assert_match /docker logout/, output diff --git a/test/commands/accessory_test.rb b/test/commands/accessory_test.rb index 268cc0b3..0e343d8c 100644 --- a/test/commands/accessory_test.rb +++ b/test/commands/accessory_test.rb @@ -137,7 +137,7 @@ class CommandsAccessoryTest < ActiveSupport::TestCase test "remove image" do assert_equal \ - "docker image prune --all --force --filter label=service=app-mysql", + "docker image rm --force private.registry/mysql:8.0", @mysql.remove_image.join(" ") end end