jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge branch 'pr-1118' 

Closes: #1118
LGTMs: @cyphar @hqhq
This commit is contained in:
Aleksa Sarai 2016-10-18 18:17:31 +11:00
parent 0259c00a35 ed6c5c038c
commit bf77e5976a
No known key found for this signature in database
GPG Key ID: 9E18AA267DDB8DB4
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
delete.go
View File

@ -27,8 +27,8 @@ func killContainer(container libcontainer.Container) error {
var deleteCommand = cli.Command{
Name: "delete",
Usage: "delete any resources held by one container or more containers often used with detached containers",
ArgsUsage: `container-id [container-id...]
Usage: "delete any resources held by one or more containers often used with detached containers",
ArgsUsage: `<container-id> [container-id...]
Where "<container-id>" is the name for the instance of the container.
@ -41,7 +41,7 @@ status of "ubuntu01" as "stopped" the following will delete resources held for
Flags: []cli.Flag{
cli.BoolFlag{
Name: "force, f",
Usage: "Forcibly kills the container if it is still running",
Usage: "Forcibly deletes the container if it is still running (uses SIGKILL)",
},
},
Action: func(context *cli.Context) error {

7
man/runc-delete.8.md
View File

@ -1,11 +1,14 @@
# NAME
runc delete - delete any resources held by the container often used with detached containers
runc delete - delete any resources held by one or more containers often used with detached containers
# SYNOPSIS
runc delete <container-id>
runc delete [command options] <container-id> [container-id...]
Where "<container-id>" is the name for the instance of the container.
# OPTIONS
--force, -f Forcibly deletes the container if it is still running (uses SIGKILL)
# EXAMPLE
For example, if the container id is "ubuntu01" and runc list currently shows the
status of "ubuntu01" as "destroyed" the following will delete resources held for