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

* Runtime: refuse to remove a running container
eliasp · Jun 20, 2013 · d8f5635 · d8f5635
2 parents d1a3d02 + 1c841d4
commit d8f5635
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/server.go b/server.go
@@ -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 {