fix: correctly unmarshal entrypoint (#876)
Signed-off-by: hackercat <me@hackerc.at> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
parent
ec34eb9532
commit
12fa4d703d
3 changed files with 12 additions and 2 deletions
|
@ -47,7 +47,7 @@ type ActionRuns struct {
|
||||||
Env map[string]string `yaml:"env"`
|
Env map[string]string `yaml:"env"`
|
||||||
Main string `yaml:"main"`
|
Main string `yaml:"main"`
|
||||||
Image string `yaml:"image"`
|
Image string `yaml:"image"`
|
||||||
Entrypoint []string `yaml:"entrypoint"`
|
Entrypoint string `yaml:"entrypoint"`
|
||||||
Args []string `yaml:"args"`
|
Args []string `yaml:"args"`
|
||||||
Steps []Step `yaml:"steps"`
|
Steps []Step `yaml:"steps"`
|
||||||
}
|
}
|
||||||
|
|
|
@ -527,6 +527,8 @@ func (sc *StepContext) runAction(actionDir string, actionPath string, localActio
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: break out parts of function to reduce complexicity
|
||||||
|
// nolint:gocyclo
|
||||||
func (sc *StepContext) execAsDocker(ctx context.Context, action *model.Action, actionName string, containerLocation string, actionLocation string, rc *RunContext, step *model.Step, localAction bool) error {
|
func (sc *StepContext) execAsDocker(ctx context.Context, action *model.Action, actionName string, containerLocation string, actionLocation string, rc *RunContext, step *model.Step, localAction bool) error {
|
||||||
var prepImage common.Executor
|
var prepImage common.Executor
|
||||||
var image string
|
var image string
|
||||||
|
@ -589,7 +591,14 @@ func (sc *StepContext) execAsDocker(ctx context.Context, action *model.Action, a
|
||||||
}
|
}
|
||||||
entrypoint := strings.Fields(step.With["entrypoint"])
|
entrypoint := strings.Fields(step.With["entrypoint"])
|
||||||
if len(entrypoint) == 0 {
|
if len(entrypoint) == 0 {
|
||||||
entrypoint = action.Runs.Entrypoint
|
if action.Runs.Entrypoint != "" {
|
||||||
|
entrypoint, err = shellquote.Split(action.Runs.Entrypoint)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
entrypoint = nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
stepContainer := sc.newStepContainer(ctx, image, cmd, entrypoint)
|
stepContainer := sc.newStepContainer(ctx, image, cmd, entrypoint)
|
||||||
return common.NewPipelineExecutor(
|
return common.NewPipelineExecutor(
|
||||||
|
|
|
@ -9,6 +9,7 @@ inputs:
|
||||||
runs:
|
runs:
|
||||||
using: docker
|
using: docker
|
||||||
image: docker://node:12-buster-slim
|
image: docker://node:12-buster-slim
|
||||||
|
entrypoint: /bin/sh -c
|
||||||
env:
|
env:
|
||||||
TEST: enabled
|
TEST: enabled
|
||||||
args:
|
args:
|
||||||
|
|
Loading…
Reference in a new issue