Remove redundant elses
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
This commit is contained in:
parent
1ba15b8aca
commit
698392cb51
|
@ -476,19 +476,17 @@ func (b *buildFile) CmdVolume(args string) error {
|
||||||
|
|
||||||
func (b *buildFile) checkPathForAddition(orig string) error {
|
func (b *buildFile) checkPathForAddition(orig string) error {
|
||||||
origPath := path.Join(b.contextPath, orig)
|
origPath := path.Join(b.contextPath, orig)
|
||||||
if p, err := filepath.EvalSymlinks(origPath); err != nil {
|
origPath, err := filepath.EvalSymlinks(origPath)
|
||||||
|
if err != nil {
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
return fmt.Errorf("%s: no such file or directory", orig)
|
return fmt.Errorf("%s: no such file or directory", orig)
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
} else {
|
|
||||||
origPath = p
|
|
||||||
}
|
}
|
||||||
if !strings.HasPrefix(origPath, b.contextPath) {
|
if !strings.HasPrefix(origPath, b.contextPath) {
|
||||||
return fmt.Errorf("Forbidden path outside the build context: %s (%s)", orig, origPath)
|
return fmt.Errorf("Forbidden path outside the build context: %s (%s)", orig, origPath)
|
||||||
}
|
}
|
||||||
_, err := os.Stat(origPath)
|
if _, err := os.Stat(origPath); err != nil {
|
||||||
if err != nil {
|
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
return fmt.Errorf("%s: no such file or directory", orig)
|
return fmt.Errorf("%s: no such file or directory", orig)
|
||||||
}
|
}
|
||||||
|
|
|
@ -910,7 +910,8 @@ func (container *Container) initializeNetworking() error {
|
||||||
container.HostsPath = hostsPath
|
container.HostsPath = hostsPath
|
||||||
|
|
||||||
return ioutil.WriteFile(container.HostsPath, content, 0644)
|
return ioutil.WriteFile(container.HostsPath, content, 0644)
|
||||||
} else if container.hostConfig.NetworkMode.IsContainer() {
|
}
|
||||||
|
if container.hostConfig.NetworkMode.IsContainer() {
|
||||||
// we need to get the hosts files from the container to join
|
// we need to get the hosts files from the container to join
|
||||||
nc, err := container.getNetworkedContainer()
|
nc, err := container.getNetworkedContainer()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -920,16 +921,16 @@ func (container *Container) initializeNetworking() error {
|
||||||
container.ResolvConfPath = nc.ResolvConfPath
|
container.ResolvConfPath = nc.ResolvConfPath
|
||||||
container.Config.Hostname = nc.Config.Hostname
|
container.Config.Hostname = nc.Config.Hostname
|
||||||
container.Config.Domainname = nc.Config.Domainname
|
container.Config.Domainname = nc.Config.Domainname
|
||||||
} else if container.daemon.config.DisableNetwork {
|
return nil
|
||||||
|
}
|
||||||
|
if container.daemon.config.DisableNetwork {
|
||||||
container.Config.NetworkDisabled = true
|
container.Config.NetworkDisabled = true
|
||||||
return container.buildHostnameAndHostsFiles("127.0.1.1")
|
return container.buildHostnameAndHostsFiles("127.0.1.1")
|
||||||
} else {
|
}
|
||||||
if err := container.allocateNetwork(); err != nil {
|
if err := container.allocateNetwork(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)
|
return container.buildHostnameAndHostsFiles(container.NetworkSettings.IPAddress)
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make sure the config is compatible with the current kernel
|
// Make sure the config is compatible with the current kernel
|
||||||
|
|
Loading…
Reference in New Issue