oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-11 17:50:58 +00:00
Code Wiki Activity

fix: IsHost is defined as false on windows (#2093)

Browse source 
* fix: IsHost is defined as false on windows

* Update docker_run.go

* Update docker_run.go
This commit is contained in:
ChristopherHX 2023-12-16 23:46:17 +01:00 • committed by GitHub
parent 24ebffd3ff
commit 98afefd092
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
act/container/docker_run.go
View file

@ -448,8 +448,8 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E
var networkingConfig *network.NetworkingConfig var networkingConfig *network.NetworkingConfig
logger.Debugf("input.NetworkAliases ==> %v", input.NetworkAliases) logger.Debugf("input.NetworkAliases ==> %v", input.NetworkAliases)
n := hostConfig.NetworkMode n := hostConfig.NetworkMode
// TODO: use IsUserDefined() once it's windows implementation matches the unix one // IsUserDefined and IsHost are broken on windows
if !n.IsDefault() && !n.IsBridge() && !n.IsHost() && !n.IsNone() && !n.IsContainer() && len(input.NetworkAliases) > 0 { if n.IsUserDefined() && n != "host" && len(input.NetworkAliases) > 0 {
endpointConfig := &network.EndpointSettings{ endpointConfig := &network.EndpointSettings{
Aliases: input.NetworkAliases, Aliases: input.NetworkAliases,
} }
@ -458,8 +458,6 @@ func (cr *containerReference) create(capAdd []string, capDrop []string) common.E
input.NetworkMode: endpointConfig, input.NetworkMode: endpointConfig,
}, },
} }
} else {
logger.Debugf("not a use defined config??")
} }
resp, err := cr.cli.ContainerCreate(ctx, config, hostConfig, networkingConfig, platSpecs, input.Name) resp, err := cr.cli.ContainerCreate(ctx, config, hostConfig, networkingConfig, platSpecs, input.Name)