From 186e22d26e7cf6e4d6f718257c653e496850914a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Doma=C5=84ski?= Date: Fri, 30 Aug 2019 23:15:47 +0200 Subject: [PATCH] include IPv6 address of linked containers in /etc/hosts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kamil Domański --- daemon/container_operations.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/daemon/container_operations.go b/daemon/container_operations.go index 1a7e19bb66..205c090501 100644 --- a/daemon/container_operations.go +++ b/daemon/container_operations.go @@ -200,7 +200,14 @@ func (daemon *Daemon) buildSandboxOptions(container *container.Container) ([]lib if alias != 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 if cEndpointID != "" { childEndpoints = append(childEndpoints, cEndpointID)