Skip to content

Commit

Permalink
Merge pull request #237 from namco1992/resolve_docker_host_ip_via_net…
Browse files Browse the repository at this point in the history
…work_inspect

Use NetworkInspect to get the gateway's IP and fallback to getDefaultGatewayIP when fails
  • Loading branch information
gianarb committed Sep 8, 2020
2 parents 4a464a0 + 5a910fb commit 8c68827
Showing 1 changed file with 31 additions and 5 deletions.
36 changes: 31 additions & 5 deletions docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (c *DockerContainer) PortEndpoint(ctx context.Context, port nat.Port, proto
// Warning: this is based on your Docker host setting. Will fail if using an SSH tunnel
// You can use the "TC_HOST" env variable to set this yourself
func (c *DockerContainer) Host(ctx context.Context) (string, error) {
host, err := c.provider.daemonHost()
host, err := c.provider.daemonHost(ctx)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -678,7 +678,7 @@ func (p *DockerProvider) RunContainer(ctx context.Context, req ContainerRequest)
// daemonHost gets the host or ip of the Docker daemon where ports are exposed on
// Warning: this is based on your Docker host setting. Will fail if using an SSH tunnel
// You can use the "TC_HOST" env variable to set this yourself
func (p *DockerProvider) daemonHost() (string, error) {
func (p *DockerProvider) daemonHost(ctx context.Context) (string, error) {
if p.hostCache != "" {
return p.hostCache, nil
}
Expand All @@ -700,9 +700,13 @@ func (p *DockerProvider) daemonHost() (string, error) {
p.hostCache = url.Hostname()
case "unix", "npipe":
if inAContainer() {
ip, err := getGatewayIp()
ip, err := p.GetGatewayIP(ctx)
if err != nil {
return "", err
// fallback to getDefaultGatewayIP
ip, err = getDefaultGatewayIP()
if err != nil {
ip = "localhost"
}
}
p.hostCache = ip
} else {
Expand Down Expand Up @@ -777,6 +781,26 @@ func (p *DockerProvider) GetNetwork(ctx context.Context, req NetworkRequest) (ty
return networkResource, err
}

func (p *DockerProvider) GetGatewayIP(ctx context.Context) (string, error) {
nw, err := p.GetNetwork(ctx, NetworkRequest{Name: "bridge"})
if err != nil {
return "", err
}

var ip string
for _, config := range nw.IPAM.Config {
if config.Gateway != "" {
ip = config.Gateway
break
}
}
if ip == "" {
return "", errors.New("Failed to get gateway IP from network settings")
}

return ip, nil
}

func inAContainer() bool {
// see https://github.com/testcontainers/testcontainers-java/blob/3ad8d80e2484864e554744a4800a81f6b7982168/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java#L15
if _, err := os.Stat("/.dockerenv"); err == nil {
Expand All @@ -785,7 +809,9 @@ func inAContainer() bool {
return false
}

func getGatewayIp() (string, error) {
// deprecated
// see https://github.com/testcontainers/testcontainers-java/blob/master/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java#L46
func getDefaultGatewayIP() (string, error) {
// see https://github.com/testcontainers/testcontainers-java/blob/3ad8d80e2484864e554744a4800a81f6b7982168/core/src/main/java/org/testcontainers/dockerclient/DockerClientConfigUtils.java#L27
cmd := exec.Command("sh", "-c", "ip route|awk '/default/ { print $3 }'")
stdout, err := cmd.Output()
Expand Down

0 comments on commit 8c68827

Please sign in to comment.