fix: allow docker host config via env variable (#770)

nitrictech · Aug 14, 2024 · 40df95f · 40df95f
1 parent b6097ac
commit 40df95f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 79 deletions.
diff --git a/pkg/docker/wsl.go b/pkg/docker/wsl.go
diff --git a/pkg/project/service.go b/pkg/project/service.go
@@ -37,6 +37,7 @@ import (
 	"github.com/nitrictech/cli/pkg/docker"
 	"github.com/nitrictech/cli/pkg/netx"
 	"github.com/nitrictech/cli/pkg/project/runtime"
+	"github.com/nitrictech/nitric/core/pkg/env"
 	"github.com/nitrictech/nitric/core/pkg/logger"
 )
 
@@ -322,22 +323,11 @@ func (s *Service) RunContainer(stop <-chan bool, updates chan<- ServiceRunUpdate
 	}
 
 	if goruntime.GOOS == "linux" {
-		isWSL, _ := docker.IsDockerRunningInWSL2(dockerClient)
-
-		// default docker host ip
-		dockerHostIP := "172.17.0.1"
-
-		if isWSL {
-			wslEth0IP := docker.GetNonLoopbackLocalIPForWSL()
-
-			if wslEth0IP != "" {
-				dockerHostIP = wslEth0IP
-			}
-		}
+		dockerHost := env.GetEnv("NITRIC_DOCKER_HOST", "172.17.0.1")
 
 		// setup host.docker.internal to route to host gateway
 		// to access rpc server hosted by local CLI run
-		hostConfig.ExtraHosts = []string{"host.docker.internal:" + dockerHostIP}
+		hostConfig.ExtraHosts = []string{"host.docker.internal:" + dockerHost.String()}
 	}
 
 	randomPort, _ := netx.TakePort(1)