Merge branch 'master' into net

This commit is contained in:
Fabrizio Steiner 2017-01-24 21:24:40 +01:00 committed by GitHub
commit db473821f6
15 changed files with 329 additions and 105 deletions

View file

@ -165,10 +165,9 @@ func (client dockerClient) StartContainer(c Container) error {
}
func (client dockerClient) RenameContainer(c Container, newName string) error {
bg := context.Background()
log.Debugf("Renaming container %s (%s) to %s", c.Name(), c.ID(), newName)
//return client.api.ContainerRename(c.ID(), newName)
// no op
return nil
return client.api.ContainerRename(bg, c.ID(), newName)
}
func (client dockerClient) IsContainerStale(c Container) (bool, error) {