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

Merge pull request from LK4D4/cont_pointer 

Return pointer from newBaseContainer
This commit is contained in:
David Calavera 2015-10-27 13:27:10 -07:00
parent 2b1b7823e6 6d9bb99c97
commit 82f70677b9
3 changed files with 7 additions and 7 deletions

6
daemon/daemon.go
View File

@ -177,10 +177,10 @@ func (daemon *Daemon) load(id string) (*Container, error) {
} }
if container.ID != id { if container.ID != id {
return &container, fmt.Errorf("Container %s is stored at %s", container.ID, id) return container, fmt.Errorf("Container %s is stored at %s", container.ID, id)
} }
return &container, nil return container, nil
} }
// Register makes a container object usable by the daemon as <container.ID> // Register makes a container object usable by the daemon as <container.ID>
@ -484,7 +484,7 @@ func (daemon *Daemon) newContainer(name string, config *runconfig.Config, imgID
base.Driver = daemon.driver.String() base.Driver = daemon.driver.String()
base.ExecDriver = daemon.execDriver.Name() base.ExecDriver = daemon.execDriver.Name()
return &base, err return base, err
} }
// GetFullContainerName returns a constructed container name. I think // GetFullContainerName returns a constructed container name. I think

4
daemon/daemon_unix.go
View File

@ -599,8 +599,8 @@ func (daemon *Daemon) registerLinks(container *Container, hostConfig *runconfig.
return nil return nil
} }
func (daemon *Daemon) newBaseContainer(id string) Container { func (daemon *Daemon) newBaseContainer(id string) *Container {
return Container{ return &Container{
CommonContainer: CommonContainer{ CommonContainer: CommonContainer{
ID: id, ID: id,
State: NewState(), State: NewState(),

4
daemon/daemon_windows.go
View File

@ -140,8 +140,8 @@ func (daemon *Daemon) registerLinks(container *Container, hostConfig *runconfig.
return nil return nil
} }
func (daemon *Daemon) newBaseContainer(id string) Container { func (daemon *Daemon) newBaseContainer(id string) *Container {
return Container{ return &Container{
CommonContainer: CommonContainer{ CommonContainer: CommonContainer{
ID: id, ID: id,
State: NewState(), State: NewState(),