From 267cc3fd54d9a71049a9bf24d755b534c724de21 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jul 2021 21:13:57 -0400 Subject: [PATCH] fix: respect custom networks when computing the container ip We also change the inspect format to support network names with non alphanumeric characters. See https://github.com/moby/moby/issues/35886 for details. --- plugins/network/network.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/network/network.go b/plugins/network/network.go index 614d0e22f..341234070 100644 --- a/plugins/network/network.go +++ b/plugins/network/network.go @@ -112,7 +112,12 @@ func GetContainerIpaddress(appName, processType, containerID string) (ipAddr str } } - b, err := common.DockerInspect(containerID, "{{.NetworkSettings.Networks.bridge.IPAddress}}") + initialNetwork := reportComputedInitialNetwork(appName) + if initialNetwork == "" { + initialNetwork = "bridge" + } + + b, err := common.DockerInspect(containerID, fmt.Sprintf("{{ $network := index .NetworkSettings.Networks \"%s\" }}{{ $network.IPAddress}}", initialNetwork)) if err != nil || len(b) == 0 { // docker < 1.9 compatibility b, err = common.DockerInspect(containerID, "{{ .NetworkSettings.IPAddress }}")