p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5613 from vieux/better_error_handling

Browse Source 
propagate errors write
Upstream-commit: b4ac4228f518ce3af125752fd46ae667dcff8042
Component: engine
This commit is contained in:
Victor Vieux
2014-05-05 16:28:15 -07:00
parent dfb1a0bff0 a2cfcf5177
commit deff094dc8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/engine/daemon/container.go
View File

@ -487,18 +487,18 @@ func (container *Container) StderrLogPipe() io.ReadCloser {
return utils.NewBufReader(reader)
}
func (container *Container) buildHostname() {
func (container *Container) buildHostnameFile() error {
container.HostnamePath = path.Join(container.root, "hostname")
if container.Config.Domainname != "" {
ioutil.WriteFile(container.HostnamePath, []byte(fmt.Sprintf("%s.%s\n", container.Config.Hostname, container.Config.Domainname)), 0644)
} else {
ioutil.WriteFile(container.HostnamePath, []byte(container.Config.Hostname+"\n"), 0644)
return ioutil.WriteFile(container.HostnamePath, []byte(fmt.Sprintf("%s.%s\n", container.Config.Hostname, container.Config.Domainname)), 0644)
}
return ioutil.WriteFile(container.HostnamePath, []byte(container.Config.Hostname+"\n"), 0644)
}
func (container *Container) buildHostnameAndHostsFiles(IP string) error {
container.buildHostname()
if err := container.buildHostnameFile(); err != nil {
return err
}
container.HostsPath = path.Join(container.root, "hosts")
return etchosts.Build(container.HostsPath, IP, container.Config.Hostname, container.Config.Domainname)
@ -998,7 +998,7 @@ func (container *Container) initializeNetworking() error {
}
container.HostsPath = "/etc/hosts"
container.buildHostname()
return container.buildHostnameFile()
} else if container.hostConfig.NetworkMode.IsContainer() {
// we need to get the hosts files from the container to join
nc, err := container.getNetworkedContainer()