fix: don't overwrite with empty cmd/entrypoint (#1076)

Co-authored-by: ChristopherHX <christopher.homberger@web.de>

Signed-off-by: Ryan <me@hackerc.at>

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

pkg/runner/step_docker.go

@@ -58,7 +58,12 @@ func (sd *stepDocker) runUsesContainer() common.Executor {
 		if err != nil {
 			return err
 		}
-		entrypoint := strings.Fields(eval.Interpolate(step.With["entrypoint"]))
+
+		var entrypoint []string
+		if entry := eval.Interpolate(step.With["entrypoint"]); entry != "" {
+			entrypoint = []string{entry}
+		}
+
 		stepContainer := sd.newStepContainer(ctx, image, cmd, entrypoint)
 
 		return common.NewPipelineExecutor(

pkg/runner/testdata/uses-docker-url/push.yml

@@ -9,3 +9,15 @@ jobs:
         with:
           somekey: somevalue
           args: echo ${INPUT_SOMEKEY} | grep somevalue
+      - uses: docker://node:16-buster-slim
+        with:
+          args: -v
+      - uses: docker://node:16-buster-slim
+        with:
+          entrypoint: /bin/sh
+          args: -c -- uname -a
+      - uses: docker://node:16-buster-slim
+        with:
+          entrypoint: /bin/sh
+          args: -c 'uname -a'
+