[FORGEJO] a network of "" is not the same as "host"
The comment that introduced this change suggests it was motivated by a border case by which the image would be empty. It is however unclear why it should have any impact on how the network name is determined. The hunk is reverted. https://github.com/nektos/act/pull/1949/files#r1315163582
This commit is contained in:
parent
616954df59
commit
09d179c15b
1 changed files with 1 additions and 8 deletions
|
@ -535,13 +535,6 @@ func (rc *RunContext) startJobContainer() common.Executor {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
jobContainerNetwork := rc.Config.ContainerNetworkMode.NetworkName()
|
|
||||||
if rc.containerImage(ctx) != "" {
|
|
||||||
jobContainerNetwork = networkName
|
|
||||||
} else if jobContainerNetwork == "" {
|
|
||||||
jobContainerNetwork = "host"
|
|
||||||
}
|
|
||||||
|
|
||||||
rc.JobContainer = container.NewContainer(&container.NewContainerInput{
|
rc.JobContainer = container.NewContainer(&container.NewContainerInput{
|
||||||
Cmd: nil,
|
Cmd: nil,
|
||||||
Entrypoint: []string{"tail", "-f", "/dev/null"},
|
Entrypoint: []string{"tail", "-f", "/dev/null"},
|
||||||
|
@ -552,7 +545,7 @@ func (rc *RunContext) startJobContainer() common.Executor {
|
||||||
Name: name,
|
Name: name,
|
||||||
Env: envList,
|
Env: envList,
|
||||||
Mounts: mounts,
|
Mounts: mounts,
|
||||||
NetworkMode: jobContainerNetwork,
|
NetworkMode: networkName,
|
||||||
NetworkAliases: []string{rc.Name},
|
NetworkAliases: []string{rc.Name},
|
||||||
Binds: binds,
|
Binds: binds,
|
||||||
Stdout: logWriter,
|
Stdout: logWriter,
|
||||||
|
|
Loading…
Reference in a new issue