clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-29 09:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command

Browse Source 
Add ability to force removal of running container via docker rm -f
This commit is contained in:
unclejack
2014-03-07 00:05:57 +02:00
parent b722aa21b7 d78fcb32ff
commit e388b6aba5
7 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server.go
+8 -1
View File
@@ -1713,6 +1713,7 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {
name := job.Args[0]
removeVolume := job.GetenvBool("removeVolume")
removeLink := job.GetenvBool("removeLink")
forceRemove := job.GetenvBool("forceRemove")
container := srv.runtime.Get(name)
@@ -1750,7 +1751,13 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {
if container != nil {
if container.State.IsRunning() {
return job.Errorf("Impossible to remove a running container, please stop it first")
if forceRemove {
if err := container.Stop(5); err != nil {
return job.Errorf("Could not stop running container, cannot remove - %v", err)
}
} else {
return job.Errorf("Impossible to remove a running container, please stop it first or use -f")
}
}
if err := srv.runtime.Destroy(container); err != nil {
return job.Errorf("Cannot destroy container %s: %s", name, err)