mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-09-01 22:38:33 +00:00
Rework entrypoints (#3269)
Co-authored-by: Thomas Anderson <127358482+zc-devs@users.noreply.github.com> Co-authored-by: 6543 <m.huber@kithara.com>
This commit is contained in:
@@ -147,15 +147,14 @@ func podContainer(step *types.Step, podName, goos string, options BackendOptions
|
||||
container.ImagePullPolicy = v1.PullAlways
|
||||
}
|
||||
|
||||
if len(step.Commands) != 0 {
|
||||
scriptEnv, command, args := common.GenerateContainerConf(step.Commands, goos)
|
||||
if len(step.Entrypoint) > 0 {
|
||||
command = step.Entrypoint
|
||||
}
|
||||
if len(step.Commands) > 0 {
|
||||
scriptEnv, command := common.GenerateContainerConf(step.Commands, goos)
|
||||
container.Command = command
|
||||
container.Args = []string{args}
|
||||
maps.Copy(step.Environment, scriptEnv)
|
||||
}
|
||||
if len(step.Entrypoint) > 0 {
|
||||
container.Command = step.Entrypoint
|
||||
}
|
||||
|
||||
container.Env = mapToEnvVars(step.Environment)
|
||||
|
||||
|
Reference in New Issue
Block a user