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

include IPv6 address of linked containers in /etc/hosts

Browse source 
Signed-off-by: Kamil Domański <kamil@domanski.co>
This commit is contained in:
Kamil Domański 2019-08-30 23:15:47 +02:00
parent 339dd0a2e5
commit 186e22d26e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/container_operations.go
View file

@ -200,7 +200,14 @@ func (daemon *Daemon) buildSandboxOptions(container *container.Container) ([]lib
if alias != child.Name[1:] { if alias != child.Name[1:] {
aliasList = aliasList + " " + child.Name[1:] aliasList = aliasList + " " + child.Name[1:]
} }
sboxOptions = append(sboxOptions, libnetwork.OptionExtraHost(aliasList, child.NetworkSettings.Networks[defaultNetName].IPAddress)) ipv4 := child.NetworkSettings.Networks[defaultNetName].IPAddress
ipv6 := child.NetworkSettings.Networks[defaultNetName].GlobalIPv6Address
if ipv4 != "" {
sboxOptions = append(sboxOptions, libnetwork.OptionExtraHost(aliasList, ipv4))
}
if ipv6 != "" {
sboxOptions = append(sboxOptions, libnetwork.OptionExtraHost(aliasList, ipv6))
}
cEndpointID = child.NetworkSettings.Networks[defaultNetName].EndpointID cEndpointID = child.NetworkSettings.Networks[defaultNetName].EndpointID
if cEndpointID != "" { if cEndpointID != "" {
childEndpoints = append(childEndpoints, cEndpointID) childEndpoints = append(childEndpoints, cEndpointID)