From 829843333b0bb62cfb71411085c59b28151cf47f Mon Sep 17 00:00:00 2001 From: Samuel Cochran Date: Wed, 30 Oct 2019 14:46:54 +1100 Subject: [PATCH 1/2] unused-for is a deprecated synonym See https://github.com/moby/moby/blob/9e7d5ac5ea55dc57185f49476e03d6efa76b3512/builder/builder-next/builder.go#L574 Signed-off-by: Samuel Cochran (cherry picked from commit 758d12e65112bed583396ee3f43cf6302f249fef) Signed-off-by: Sebastiaan van Stijn --- cli/command/builder/prune.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/command/builder/prune.go b/cli/command/builder/prune.go index 3d4d4fc164..94249bc0b3 100644 --- a/cli/command/builder/prune.go +++ b/cli/command/builder/prune.go @@ -45,7 +45,7 @@ func NewPruneCommand(dockerCli command.Cli) *cobra.Command { flags := cmd.Flags() flags.BoolVarP(&options.force, "force", "f", false, "Do not prompt for confirmation") flags.BoolVarP(&options.all, "all", "a", false, "Remove all unused images, not just dangling ones") - flags.Var(&options.filter, "filter", "Provide filter values (e.g. 'unused-for=24h')") + flags.Var(&options.filter, "filter", "Provide filter values (e.g. 'until=24h')") flags.Var(&options.keepStorage, "keep-storage", "Amount of disk space to keep for cache") return cmd From f9a5c1f152106a28d347b02e4c9ab506ad1bf04e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 18 Feb 2020 14:30:28 +0100 Subject: [PATCH 2/2] Fix builder prune -a/--all flag description Signed-off-by: Sebastiaan van Stijn (cherry picked from commit aad9d2c958b24639ea1d6dd46e73b2fdb36f4b62) Signed-off-by: Sebastiaan van Stijn --- cli/command/builder/prune.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/command/builder/prune.go b/cli/command/builder/prune.go index 94249bc0b3..573a4a93d2 100644 --- a/cli/command/builder/prune.go +++ b/cli/command/builder/prune.go @@ -44,7 +44,7 @@ func NewPruneCommand(dockerCli command.Cli) *cobra.Command { flags := cmd.Flags() flags.BoolVarP(&options.force, "force", "f", false, "Do not prompt for confirmation") - flags.BoolVarP(&options.all, "all", "a", false, "Remove all unused images, not just dangling ones") + flags.BoolVarP(&options.all, "all", "a", false, "Remove all unused build cache, not just dangling ones") flags.Var(&options.filter, "filter", "Provide filter values (e.g. 'until=24h')") flags.Var(&options.keepStorage, "keep-storage", "Amount of disk space to keep for cache")