From 88d0206ad5356c361ceb17d664e82b90b9e7e6dc Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 1 Nov 2018 01:57:41 +0900 Subject: [PATCH] Change to use containip when no docker mode --- container/provider.go | 11 ++++++++--- docker/docker.go | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/container/provider.go b/container/provider.go index 1e65cfa..9434285 100644 --- a/container/provider.go +++ b/container/provider.go @@ -18,6 +18,7 @@ package container import ( "context" + "docker.io/go-docker/api/types" "errors" @@ -65,9 +66,13 @@ func Create(config tesseract.ContainerConfig) (DockerContainer, error) { return DockerContainer{}, err } - ipAddress := retrieveNetworkIpAddress(config.Network.Name, containerInfo) - - client, err := createClient(ipAddress, config.Port) + var client *rpc.ClientStream + if config.Network == nil { + client, err = createClient(config.ContainerIp, config.Port) + } else { + ipAddress := retrieveNetworkIpAddress(config.Network.Name, containerInfo) + client, err = createClient(ipAddress, config.Port) + } if err != nil { iLogger.Errorf(nil, "[Tesseract] closing container %s", res.ID) diff --git a/docker/docker.go b/docker/docker.go index b0c54f7..2fe1d70 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -46,6 +46,7 @@ func CreateContainer(config tesseract.ContainerConfig) (container.ContainerCreat networkName := "" portBinding := nat.PortMap{} exposedPort := nat.PortSet{} + var networkConfig *network.NetworkingConfig if config.Network != nil {