toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3441 from RoelVanNyen/container_start

Browse Source 
Just pass the container in RegisterLinks(), no need to lookup by name
Upstream-commit: d44abae873f9327962ee9a2ad079a17c582e9661
Component: engine
This commit is contained in:
Victor Vieux
2014-01-06 10:19:01 -08:00
parent acd3d57601 8b66161d6d
commit 1e33ac0792
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/server.go
+2 -7
View File
@@ -1714,12 +1714,8 @@ func (srv *Server) ImageGetCached(imgID string, config *Config) (*Image, error)
return nil, nil
}
func (srv *Server) RegisterLinks(name string, hostConfig *HostConfig) error {
func (srv *Server) RegisterLinks(container *Container, hostConfig *HostConfig) error {
runtime := srv.runtime
container := runtime.Get(name)
if container == nil {
return fmt.Errorf("No such container: %s", name)
}
if hostConfig != nil && hostConfig.Links != nil {
for _, l := range hostConfig.Links {
@@ -1792,8 +1788,7 @@ func (srv *Server) ContainerStart(job *engine.Job) engine.Status {
}
}
// Register any links from the host config before starting the container
// FIXME: we could just pass the container here, no need to lookup by name again.
if err := srv.RegisterLinks(name, &hostConfig); err != nil {
if err := srv.RegisterLinks(container, &hostConfig); err != nil {
job.Error(err)
return engine.StatusErr
}