github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-03 21:11:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: [CDE-192]: handle docker-host for non darwin internal url (#2406)

Browse Source 
* feat: [CDE-192]: handle docker-host for non darwin internal url
* feat: [CDE-192]: handle docker-host for non darwin internal url
This commit is contained in:
Ansuman Satapathy 2024-08-06 11:10:42 +00:00 committed by Harness
parent 8e7398d362
commit ce8b17bb93
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/gitspace/orchestrator/container/embedded_docker.go
View File

@ -18,6 +18,7 @@ import (
"context"
"fmt"
"io"
goruntime "runtime"
"strconv"
"strings"
@ -614,12 +615,7 @@ func (e *EmbeddedDockerOrchestrator) createContainer(
return fmt.Errorf("logging error: %w", loggingErr)
}
_, err := dockerClient.ContainerCreate(ctx, &container.Config{
Image: imageName,
Entrypoint: []string{"/bin/sh"},
Cmd: []string{"-c", "trap 'exit 0' 15; sleep infinity & wait $!"},
ExposedPorts: exposedPorts,
}, &container.HostConfig{
hostConfig := &container.HostConfig{
PortBindings: portBindings,
Mounts: []mount.Mount{
{
@ -628,7 +624,20 @@ func (e *EmbeddedDockerOrchestrator) createContainer(
Target: workingDirectory,
},
},
}, nil, nil, containerName)
}
if goruntime.GOOS == "linux" {
extraHosts := []string{"host.docker.internal:host-gateway"}
hostConfig.ExtraHosts = extraHosts
}
containerConfig := &container.Config{
Image: imageName,
Entrypoint: []string{"/bin/sh"},
Cmd: []string{"-c", "trap 'exit 0' 15; sleep infinity & wait $!"},
ExposedPorts: exposedPorts,
}
_, err := dockerClient.ContainerCreate(ctx, containerConfig,
hostConfig, nil, nil, containerName)
if err != nil {
loggingErr = logStreamInstance.Write("Error while creating container: " + err.Error())