Patched options() to let container options propagate to job containers (#80)

nicorac · wolfogre · commit 7e20ddf92846 · 2024-03-04T02:56:52.000Z
This PR let "general" container config to be propagated to each job container. See: - https://gitea.com/gitea/act_runner/issues/265#issuecomment-744382 - https://gitea.com/gitea/act_runner/issues/79 - https://gitea.com/gitea/act_runner/issues/378 Reviewed-on: https://gitea.com/gitea/act/pulls/80 Reviewed-by: Jason Song <i@wolfogre.com> Co-authored-by: Claudio Nicora <claudio.nicora@gmail.com> Co-committed-by: Claudio Nicora <claudio.nicora@gmail.com>
diff --git a/pkg/runner/run_context.go b/pkg/runner/run_context.go
@@ -717,7 +717,7 @@ func (rc *RunContext) options(ctx context.Context) string {
 	job := rc.Run.Job()
 	c := job.Container()
 	if c != nil {
-		return rc.ExprEval.Interpolate(ctx, c.Options)
+		return rc.Config.ContainerOptions + " " + rc.ExprEval.Interpolate(ctx, c.Options)
 	}
 
 	return rc.Config.ContainerOptions

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ func (rc *RunContext) options(ctx context.Context) string {`
`717`	`717`	`job := rc.Run.Job()`
`718`	`718`	`c := job.Container()`
`719`	`719`	`if c != nil {`
`720`		`- return rc.ExprEval.Interpolate(ctx, c.Options)`
	`720`	`+ return rc.Config.ContainerOptions + " " + rc.ExprEval.Interpolate(ctx, c.Options)`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`return rc.Config.ContainerOptions`