Skip to content

Commit bf77e59

Browse files
committed
merge branch 'pr-1118'
Closes: #1118 LGTMs: @cyphar @hqhq
2 parents 0259c00 + ed6c5c0 commit bf77e59

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

delete.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ func killContainer(container libcontainer.Container) error {
2727

2828
var deleteCommand = cli.Command{
2929
Name: "delete",
30-
Usage: "delete any resources held by one container or more containers often used with detached containers",
31-
ArgsUsage: `container-id [container-id...]
30+
Usage: "delete any resources held by one or more containers often used with detached containers",
31+
ArgsUsage: `<container-id> [container-id...]
3232
3333
Where "<container-id>" is the name for the instance of the container.
3434
@@ -41,7 +41,7 @@ status of "ubuntu01" as "stopped" the following will delete resources held for
4141
Flags: []cli.Flag{
4242
cli.BoolFlag{
4343
Name: "force, f",
44-
Usage: "Forcibly kills the container if it is still running",
44+
Usage: "Forcibly deletes the container if it is still running (uses SIGKILL)",
4545
},
4646
},
4747
Action: func(context *cli.Context) error {

man/runc-delete.8.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# NAME
2-
runc delete - delete any resources held by the container often used with detached containers
2+
runc delete - delete any resources held by one or more containers often used with detached containers
33

44
# SYNOPSIS
5-
runc delete <container-id>
5+
runc delete [command options] <container-id> [container-id...]
66

77
Where "<container-id>" is the name for the instance of the container.
88

9+
# OPTIONS
10+
--force, -f Forcibly deletes the container if it is still running (uses SIGKILL)
11+
912
# EXAMPLE
1013
For example, if the container id is "ubuntu01" and runc list currently shows the
1114
status of "ubuntu01" as "destroyed" the following will delete resources held for

0 commit comments

Comments
 (0)