codingworkshop/act
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly parse arguments to Docker container steps (#539)

Browse Source
This commit is contained in:
Kamil Domański
2021-02-23 18:47:06 +01:00
committed by GitHub
parent c4f1f3a1cf
commit 475a6aa1d0
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/runner/step_context.go
View File

@@ -11,6 +11,7 @@ import (
"strings"
log "github.com/sirupsen/logrus"
"github.com/kballard/go-shellquote"
"github.com/nektos/act/pkg/common"
"github.com/nektos/act/pkg/container"
@@ -241,7 +242,10 @@ func (sc *StepContext) runUsesContainer() common.Executor {
step := sc.Step
return func(ctx context.Context) error {
image := strings.TrimPrefix(step.Uses, "docker://")
cmd := strings.Fields(sc.RunContext.NewExpressionEvaluator().Interpolate(step.With["args"]))
cmd, err := shellquote.Split(sc.RunContext.NewExpressionEvaluator().Interpolate(step.With["args"]))
if err != nil {
return err
}
entrypoint := strings.Fields(step.With["entrypoint"])
stepContainer := sc.newStepContainer(ctx, image, cmd, entrypoint)
@@ -355,7 +359,10 @@ func (sc *StepContext) runAction(actionDir string, actionPath string) common.Exe
})
}
cmd := strings.Fields(step.With["args"])
cmd, err := shellquote.Split(step.With["args"])
if err != nil {
return err
}
if len(cmd) == 0 {
cmd = action.Runs.Args
}