1
0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00

Merge pull request #7549 from vieux/fix_leftover

fix #7374 leftover
Upstream-commit: 136631df46aea853d968f6f8c284381c2ee91604
Component: engine
This commit is contained in:
Tibor Vass
2014-08-12 19:51:57 -04:00

View File

@@ -58,7 +58,7 @@ func (daemon *Daemon) ContainerDestroy(job *engine.Job) engine.Status {
return job.Errorf("Could not kill running container, cannot remove - %v", err)
}
} else {
return job.Errorf("You cannot remove a running container. Stop the container before attempting removal or use -s or -k")
return job.Errorf("You cannot remove a running container. Stop the container before attempting removal or use -f")
}
}
if err := daemon.Destroy(container); err != nil {