Remove accessory images using tags rather than labels

This commit is contained in:
Jeremy Daer
2023-03-22 23:57:43 -07:00
committed by Jeremy Daer
parent e2d10ec5a9
commit e859a581ab
4 changed files with 5 additions and 5 deletions

View File

@@ -100,7 +100,7 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
end end
def remove_image def remove_image
docker :image, :prune, "--all", "--force", *service_filter docker :image, :rm, "--force", image
end end
private private

View File

@@ -126,7 +126,7 @@ class CliAccessoryTest < CliTestCase
end end
test "remove_image" do 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 end
test "remove_service_directory" do test "remove_service_directory" do

View File

@@ -235,12 +235,12 @@ class CliMainTest < CliTestCase
assert_match /docker container stop app-mysql/, output assert_match /docker container stop app-mysql/, output
assert_match /docker container prune --force --filter label=service=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 /rm -rf app-mysql/, output
assert_match /docker container stop app-redis/, output assert_match /docker container stop app-redis/, output
assert_match /docker container prune --force --filter label=service=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 /rm -rf app-redis/, output
assert_match /docker logout/, output assert_match /docker logout/, output

View File

@@ -137,7 +137,7 @@ class CommandsAccessoryTest < ActiveSupport::TestCase
test "remove image" do test "remove image" do
assert_equal \ 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(" ") @mysql.remove_image.join(" ")
end end
end end