fix: allow docker internal host to be changed to an interface ip

critical for docker in docker runs

pkg/docker/interfaceip.go

@@ -0,0 +1,59 @@
+// Copyright Nitric Pty Ltd.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at:
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package docker
+
+import (
+	"fmt"
+	"net"
+
+	"github.com/samber/lo"
+)
+
+// getNonLoopback returns the non loopback IP of the provided interface
+func getNonLoopback(iface net.Interface) (string, error) {
+	addrs, err := iface.Addrs()
+	if err != nil {
+		return "", err
+	}
+
+	for _, addr := range addrs {
+		if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+			if ipnet.IP.To4() != nil {
+				return ipnet.IP.String(), nil
+			}
+		}
+	}
+
+	return "", fmt.Errorf("no non-loopback address found for interface %s", iface.Name)
+}
+
+// GetInterfaceIP returns the IP address of the provided interface
+func GetInterfaceIP(ifaceName string) (string, error) {
+	interfaces, err := net.Interfaces()
+	if err != nil {
+		return "", fmt.Errorf("failed to get interfaces: %w", err)
+	}
+
+	iface, found := lo.Find[net.Interface](interfaces, func(item net.Interface) bool {
+		return item.Name == ifaceName
+	})
+	if !found {
+		return "", fmt.Errorf("interface %s not found", ifaceName)
+	}
+
+	return getNonLoopback(iface)
+}

pkg/project/service.go

@@ -322,19 +322,19 @@ 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"
+		dockerHostInterface := os.Getenv("NITRIC_DOCKER_HOST_IFACE")
 
-		if isWSL {
-			wslEth0IP := docker.GetNonLoopbackLocalIPForWSL()
-
-			if wslEth0IP != "" {
-				dockerHostIP = wslEth0IP
+		if dockerHostInterface != "" {
+			// get docker host ip from interface
+			dockerHostIP, err = docker.GetInterfaceIP(dockerHostInterface)
+			if err != nil {
+				return err
 			}
 		}
 
+		fmt.Println("dockerHost: ", dockerHostIP)
+
 		// 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}