vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

oci: ignore non existing containers on delete

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-05-11 11:45:31 +02:00
parent fbc5e49a60
commit 2ddc062bbe
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oci/oci.go
View file

@ -510,7 +510,8 @@ func (r *Runtime) StopContainer(c *Container, timeout int64) error {
func (r *Runtime) DeleteContainer(c *Container) error {
c.opLock.Lock()
defer c.opLock.Unlock()
return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.Path(c), "delete", c.name)
_, err := utils.ExecCmd(r.Path(c), "delete", "--force", c.name)
return err
}
// UpdateStatus refreshes the status of the container.