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

Merge pull request #3441 from RoelVanNyen/container_start 

Just pass the container in RegisterLinks(), no need to lookup by name
This commit is contained in:
Victor Vieux 2014-01-06 10:19:01 -08:00
parent 5b4a0cac4e 42c7dc448f
commit d44abae873
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server.go
View File

@ -1714,12 +1714,8 @@ func (srv *Server) ImageGetCached(imgID string, config *Config) (*Image, error)
return nil, nil return nil, nil
} }
func (srv *Server) RegisterLinks(name string, hostConfig *HostConfig) error { func (srv *Server) RegisterLinks(container *Container, hostConfig *HostConfig) error {
runtime := srv.runtime runtime := srv.runtime
container := runtime.Get(name)
if container == nil {
return fmt.Errorf("No such container: %s", name)
}
if hostConfig != nil && hostConfig.Links != nil { if hostConfig != nil && hostConfig.Links != nil {
for _, l := range hostConfig.Links { 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 // 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(container, &hostConfig); err != nil {
if err := srv.RegisterLinks(name, &hostConfig); err != nil {
job.Error(err) job.Error(err)
return engine.StatusErr return engine.StatusErr
} }