opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 09:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

clarify container prune --force

Browse Source 
the --force parameter should only be used for the CLI and should only
dictate whether to prompt the user for confirmation.

Fixes: #4844
Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2020-01-12 10:54:14 -06:00
parent 2d5fd7cc37
commit 649331cb18
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/podman/containers_prune.go
View File

@ -40,7 +40,7 @@ func init() {
pruneContainersCommand.SetHelpTemplate(HelpTemplate()) pruneContainersCommand.SetHelpTemplate(HelpTemplate())
pruneContainersCommand.SetUsageTemplate(UsageTemplate()) pruneContainersCommand.SetUsageTemplate(UsageTemplate())
flags := pruneContainersCommand.Flags() flags := pruneContainersCommand.Flags()
flags.BoolVarP(&pruneContainersCommand.Force, "force", "f", false, "Force removal of a running container. The default is false") flags.BoolVarP(&pruneContainersCommand.Force, "force", "f", false, "Skip interactive prompt for container removal")
flags.StringArrayVar(&pruneContainersCommand.Filter, "filter", []string{}, "Provide filter values (e.g. 'until=<timestamp>')") flags.StringArrayVar(&pruneContainersCommand.Filter, "filter", []string{}, "Provide filter values (e.g. 'until=<timestamp>')")
} }
@ -68,7 +68,7 @@ Are you sure you want to continue? [y/N] `)
if c.GlobalIsSet("max-workers") { if c.GlobalIsSet("max-workers") {
maxWorkers = c.GlobalFlags.MaxWorks maxWorkers = c.GlobalFlags.MaxWorks
} }
ok, failures, err := runtime.Prune(getContext(), maxWorkers, c.Force, c.Filter) ok, failures, err := runtime.Prune(getContext(), maxWorkers, c.Filter)
if err != nil { if err != nil {
if errors.Cause(err) == define.ErrNoSuchCtr { if errors.Cause(err) == define.ErrNoSuchCtr {
if len(c.InputArgs) > 1 { if len(c.InputArgs) > 1 {

2
cmd/podman/system_prune.go
View File

@ -92,7 +92,7 @@ Are you sure you want to continue? [y/N] `, volumeString)
rmWorkers := shared.Parallelize("rm") rmWorkers := shared.Parallelize("rm")
fmt.Println("Deleted Containers") fmt.Println("Deleted Containers")
ok, failures, err = runtime.Prune(ctx, rmWorkers, false, []string{}) ok, failures, err = runtime.Prune(ctx, rmWorkers, []string{})
if err != nil { if err != nil {
if lasterr != nil { if lasterr != nil {
logrus.Errorf("%q", err) logrus.Errorf("%q", err)

3
docs/source/markdown/podman-container-prune.1.md
View File

@ -11,6 +11,9 @@ podman-container-prune - Remove all stopped containers from local storage
## OPTIONS ## OPTIONS
**--force**, **-f**
Do not provide an interactive prompt for container removal.
**-h**, **--help** **-h**, **--help**
Print usage statement Print usage statement

4
pkg/adapter/containers.go
View File

@ -1048,7 +1048,7 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal
} }
// Prune removes stopped containers // Prune removes stopped containers
func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, filters []string) ([]string, map[string]error, error) { func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, filters []string) ([]string, map[string]error, error) {
var ( var (
ok = []string{} ok = []string{}
failures = map[string]error{} failures = map[string]error{}
@ -1100,7 +1100,7 @@ func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, fi
pool.Add(shared.Job{ pool.Add(shared.Job{
ID: ctr.ID(), ID: ctr.ID(),
Fn: func() error { Fn: func() error {
err := r.Runtime.RemoveContainer(ctx, ctr, force, false) err := r.Runtime.RemoveContainer(ctx, ctr, false, false)
if err != nil { if err != nil {
logrus.Debugf("Failed to prune container %s: %s", ctr.ID(), err.Error()) logrus.Debugf("Failed to prune container %s: %s", ctr.ID(), err.Error())
} }

2
pkg/adapter/containers_remote.go
View File

@ -922,7 +922,7 @@ func (r *LocalRuntime) Top(cli *cliconfig.TopValues) ([]string, error) {
} }
// Prune removes stopped containers // Prune removes stopped containers
func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, filter []string) ([]string, map[string]error, error) { func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, filter []string) ([]string, map[string]error, error) {
var ( var (
ok = []string{} ok = []string{}