Merge ba07667705
into c6f408fe37
This commit is contained in:
commit
f5ca26726b
1 changed files with 3 additions and 2 deletions
|
@ -130,7 +130,7 @@ func New(config *Config) (*ContainerServer, error) {
|
||||||
lock = new(sync.Mutex)
|
lock = new(sync.Mutex)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &ContainerServer{
|
c := &ContainerServer{
|
||||||
runtime: runtime,
|
runtime: runtime,
|
||||||
store: store,
|
store: store,
|
||||||
storageImageServer: imageService,
|
storageImageServer: imageService,
|
||||||
|
@ -146,7 +146,8 @@ func New(config *Config) (*ContainerServer, error) {
|
||||||
sandboxes: make(map[string]*sandbox.Sandbox),
|
sandboxes: make(map[string]*sandbox.Sandbox),
|
||||||
},
|
},
|
||||||
config: config,
|
config: config,
|
||||||
}, nil
|
}
|
||||||
|
return c, c.Update()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update makes changes to the server's state (lists of pods and containers) to
|
// Update makes changes to the server's state (lists of pods and containers) to
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue