From f8a05cb8abdf771e8dcca6d3ac9e058080404b46 Mon Sep 17 00:00:00 2001 From: Robotex Date: Fri, 24 Mar 2017 22:58:00 +0100 Subject: [PATCH] Added host network check --- container/client.go | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/container/client.go b/container/client.go index 9824b81..5055e7a 100644 --- a/container/client.go +++ b/container/client.go @@ -140,18 +140,22 @@ func (client dockerClient) StartContainer(c Container) error { return err } - for k := range simpleNetworkConfig.EndpointsConfig { - err = client.api.NetworkDisconnect(bg, k, creation.ID, true) - if err != nil { - return err - } - } + if !(hostConfig.NetworkMode.IsHost()) { - for k, v := range networkConfig.EndpointsConfig { - err = client.api.NetworkConnect(bg, k, creation.ID, v) - if err != nil { - return err + for k := range simpleNetworkConfig.EndpointsConfig { + err = client.api.NetworkDisconnect(bg, k, creation.ID, true) + if err != nil { + return err + } } + + for k, v := range networkConfig.EndpointsConfig { + err = client.api.NetworkConnect(bg, k, creation.ID, v) + if err != nil { + return err + } + } + } log.Debugf("Starting container %s (%s)", name, creation.ID)