kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #18592 from hqhq/hq_fix_start

Browse source 
Add lock for container update
This commit is contained in:
Antonio Murdaca 2015-12-12 12:17:18 +01:00
commit 241f6d7107
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
container/container.go
View file

@ -545,6 +545,8 @@ func (container *Container) StopSignal() int {
// See https://github.com/docker/docker/pull/17779 // See https://github.com/docker/docker/pull/17779
// for a more detailed explanation on why we don't want that. // for a more detailed explanation on why we don't want that.
func (container *Container) InitDNSHostConfig() { func (container *Container) InitDNSHostConfig() {
container.Lock()
defer container.Unlock()
if container.HostConfig.DNS == nil { if container.HostConfig.DNS == nil {
container.HostConfig.DNS = make([]string, 0) container.HostConfig.DNS = make([]string, 0)
} }

6
daemon/start.go
View file

@ -30,12 +30,6 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *runconfig.HostConf
// creating a container, not during start. // creating a container, not during start.
if hostConfig != nil { if hostConfig != nil {
logrus.Warn("DEPRECATED: Setting host configuration options when the container starts is deprecated and will be removed in Docker 1.12") 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 { if err := daemon.adaptContainerSettings(hostConfig, false); err != nil {
return err return err
} }