#type(scope): description

#WARNING: Cannot parse issue or ticket number from branch name
#Signed-off-by: Chi-Sheng Liu <[email protected]>

# ========================================
# type:
# - build
# - chore
# - ci
# - docs
# - feat
# - fix
# - perf
# - refactor
# - revert
# - style
# - test

Author: MortalHappiness

pkg/docker/docker_util.go

@@ -6,7 +6,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
+	"runtime"
 	"strings"
 
 	"github.com/docker/docker/client"
@@ -60,6 +62,18 @@ var (
 	ExtraHosts         = []string{"host.docker.internal:host-gateway"}
 )
 
+// GetExtraHosts will return extra hosts for the container
+func GetExtraHosts() []string {
+	// Linux machine with native docker engine does not have host.docker.internal and needs to add the hostname mapping manually.
+	if runtime.GOOS == "linux" {
+		// Here assume that if /var/run/docker.sock exists and is a socket file and is not symbolic link, then the docker engine is native
+		if fileInfo, err := os.Lstat("/var/run/docker.sock"); err == nil && fileInfo.Mode().Type() == fs.ModeSocket {
+			return ExtraHosts
+		}
+	}
+	return []string{}
+}
+
 // GetDockerClient will returns the docker client
 func GetDockerClient() (Docker, error) {
 	if Client == nil {
@@ -266,7 +280,7 @@ func StartContainer(ctx context.Context, cli Docker, volumes []mount.Mount, expo
 		Mounts:       volumes,
 		PortBindings: portBindings,
 		Privileged:   true,
-		ExtraHosts:   ExtraHosts, // add it because linux machine doesn't have this host name by default
+		ExtraHosts:   GetExtraHosts(),
 	}, nil,
 		nil, name)
 

pkg/docker/docker_util_test.go

@@ -196,7 +196,7 @@ func TestStartContainer(t *testing.T) {
 			Mounts:       Volumes,
 			PortBindings: p2,
 			Privileged:   true,
-			ExtraHosts:   ExtraHosts,
+			ExtraHosts:   GetExtraHosts(),
 		}, nil, nil, mock.Anything).Return(container.ContainerCreateCreatedBody{
 			ID: "Hello",
 		}, nil)
@@ -226,7 +226,7 @@ func TestStartContainer(t *testing.T) {
 			Mounts:       Volumes,
 			PortBindings: p2,
 			Privileged:   true,
-			ExtraHosts:   ExtraHosts,
+			ExtraHosts:   GetExtraHosts(),
 		}, nil, nil, mock.Anything).Return(container.ContainerCreateCreatedBody{
 			ID: "Hello",
 		}, nil)
@@ -253,7 +253,7 @@ func TestStartContainer(t *testing.T) {
 			Mounts:       Volumes,
 			PortBindings: p2,
 			Privileged:   true,
-			ExtraHosts:   ExtraHosts,
+			ExtraHosts:   GetExtraHosts(),
 		}, nil, nil, mock.Anything).Return(container.ContainerCreateCreatedBody{
 			ID: "",
 		}, fmt.Errorf("error"))
@@ -279,7 +279,7 @@ func TestStartContainer(t *testing.T) {
 			Mounts:       Volumes,
 			PortBindings: p2,
 			Privileged:   true,
-			ExtraHosts:   ExtraHosts,
+			ExtraHosts:   GetExtraHosts(),
 		}, nil, nil, mock.Anything).Return(container.ContainerCreateCreatedBody{
 			ID: "Hello",
 		}, nil)