docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #820 from vieux/rename_destroy 

rename Destroy ro RemoveContainer for consistency
This commit is contained in:
Victor Vieux 2015-05-20 13:29:21 -07:00
parent 89d3c2a4cb b3222a8f11
commit 53e3c5b05f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/engine.go
View File

@ -400,8 +400,8 @@ func (e *Engine) Create(config *ContainerConfig, name string, pullImage bool) (*
return e.containers[id], nil return e.containers[id], nil
} }
// Destroy and remove a container from the engine. // RemoveContainer a container from the engine.
func (e *Engine) Destroy(container *Container, force bool) error { func (e *Engine) RemoveContainer(container *Container, force bool) error {
if err := e.client.RemoveContainer(container.Id, force, true); err != nil { if err := e.client.RemoveContainer(container.Id, force, true); err != nil {
return err return err
} }

2
cluster/swarm/cluster.go
View File

@ -149,7 +149,7 @@ func (c *Cluster) RemoveContainer(container *cluster.Container, force bool) erro
c.scheduler.Lock() c.scheduler.Lock()
defer c.scheduler.Unlock() defer c.scheduler.Unlock()
if err := container.Engine.Destroy(container, force); err != nil { if err := container.Engine.RemoveContainer(container, force); err != nil {
return err return err
} }