Merge pull request #961 from dotcloud/933-warning_rm-running

* Runtime: refuse to remove a running container
This commit is contained in:
Solomon Hykes 2013-06-20 10:25:02 -07:00
commit d8f56352da

View file

@ -751,6 +751,9 @@ func (srv *Server) ContainerRestart(name string, t int) error {
func (srv *Server) ContainerDestroy(name string, removeVolume bool) error {
if container := srv.runtime.Get(name); container != nil {
if container.State.Running {
return fmt.Errorf("Impossible to remove a running container, please stop it first")
}
volumes := make(map[string]struct{})
// Store all the deleted containers volumes
for _, volumeId := range container.Volumes {