mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #18592 from hqhq/hq_fix_start
Add lock for container update
This commit is contained in:
commit
241f6d7107
2 changed files with 2 additions and 6 deletions
|
@ -545,6 +545,8 @@ func (container *Container) StopSignal() int {
|
|||
// See https://github.com/docker/docker/pull/17779
|
||||
// for a more detailed explanation on why we don't want that.
|
||||
func (container *Container) InitDNSHostConfig() {
|
||||
container.Lock()
|
||||
defer container.Unlock()
|
||||
if container.HostConfig.DNS == nil {
|
||||
container.HostConfig.DNS = make([]string, 0)
|
||||
}
|
||||
|
|
|
@ -30,12 +30,6 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *runconfig.HostConf
|
|||
// creating a container, not during start.
|
||||
if hostConfig != nil {
|
||||
logrus.Warn("DEPRECATED: Setting host configuration options when the container starts is deprecated and will be removed in Docker 1.12")
|
||||
container.Lock()
|
||||
if err := parseSecurityOpt(container, hostConfig); err != nil {
|
||||
container.Unlock()
|
||||
return err
|
||||
}
|
||||
container.Unlock()
|
||||
if err := daemon.adaptContainerSettings(hostConfig, false); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue