Implement kpod rm
Kpod rm removes a container from the system Signed-off-by: Ryan Cole <rcyoalne@gmail.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: umohnani8 <umohnani@redhat.com>
This commit is contained in:
parent
8538c4067a
commit
c88bc13b07
14 changed files with 303 additions and 60 deletions
49
libkpod/remove.go
Normal file
49
libkpod/remove.go
Normal file
|
@ -0,0 +1,49 @@
|
|||
package libkpod
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/kubernetes-incubator/cri-o/oci"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// Remove removes a container
|
||||
func (c *ContainerServer) Remove(container string, force bool) (string, error) {
|
||||
ctr, err := c.LookupContainer(container)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
ctrID := ctr.ID()
|
||||
|
||||
cState := c.runtime.ContainerStatus(ctr)
|
||||
if cState.Status == oci.ContainerStateCreated || cState.Status == oci.ContainerStateRunning {
|
||||
if force {
|
||||
_, err = c.ContainerStop(container, -1)
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "unable to stop container %s", ctrID)
|
||||
}
|
||||
} else {
|
||||
return "", errors.Errorf("cannot remove running container %s", ctrID)
|
||||
}
|
||||
}
|
||||
|
||||
if err := c.runtime.DeleteContainer(ctr); err != nil {
|
||||
return "", errors.Wrapf(err, "failed to delete container %s", ctrID)
|
||||
}
|
||||
if err := os.Remove(filepath.Join(c.Config().RuntimeConfig.ContainerExitsDir, ctrID)); err != nil && !os.IsNotExist(err) {
|
||||
return "", errors.Wrapf(err, "failed to remove container exit file %s", ctrID)
|
||||
}
|
||||
c.RemoveContainer(ctr)
|
||||
|
||||
if err := c.storageRuntimeServer.DeleteContainer(ctrID); err != nil {
|
||||
return "", errors.Wrapf(err, "failed to delete storage for container %s", ctrID)
|
||||
}
|
||||
|
||||
c.ReleaseContainerName(ctr.Name())
|
||||
|
||||
if err := c.ctrIDIndex.Delete(ctrID); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return ctrID, nil
|
||||
}
|
28
libkpod/stop.go
Normal file
28
libkpod/stop.go
Normal file
|
@ -0,0 +1,28 @@
|
|||
package libkpod
|
||||
|
||||
import (
|
||||
"github.com/kubernetes-incubator/cri-o/oci"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// ContainerStop stops a running container with a grace period (i.e., timeout).
|
||||
func (c *ContainerServer) ContainerStop(container string, timeout int64) (string, error) {
|
||||
ctr, err := c.LookupContainer(container)
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "failed to find container %s", container)
|
||||
}
|
||||
|
||||
cStatus := c.runtime.ContainerStatus(ctr)
|
||||
if cStatus.Status != oci.ContainerStateStopped {
|
||||
if err := c.runtime.StopContainer(ctr, timeout); err != nil {
|
||||
return "", errors.Wrapf(err, "failed to stop container %s", ctr.ID())
|
||||
}
|
||||
if err := c.storageRuntimeServer.StopContainer(ctr.ID()); err != nil {
|
||||
return "", errors.Wrapf(err, "failed to unmount container %s", ctr.ID())
|
||||
}
|
||||
}
|
||||
|
||||
c.ContainerStateToDisk(ctr)
|
||||
|
||||
return ctr.ID(), nil
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue