docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Merge pull request #17405 from LK4D4/cont_pointer

Browse Source 
Return pointer from newBaseContainer
Upstream-commit: 82f70677b99e7d30c63d40658b36b0c5373cadba
Component: engine
This commit is contained in:
David Calavera
2015-10-27 13:27:10 -07:00
parent 64556fe044 b9824763f3
commit af90e68a88
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/daemon.go
View File

@@ -177,10 +177,10 @@ func (daemon *Daemon) load(id string) (*Container, error) {
}
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>
@@ -484,7 +484,7 @@ func (daemon *Daemon) newContainer(name string, config *runconfig.Config, imgID
base.Driver = daemon.driver.String()
base.ExecDriver = daemon.execDriver.Name()
return &base, err
return base, err
}
// GetFullContainerName returns a constructed container name. I think

4
components/engine/daemon/daemon_unix.go
View File

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

4
components/engine/daemon/daemon_windows.go
View File

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