nprasad2077/runner
1
0 Fork 0
mirror of https://gitea.com/gitea/runner.git synced 2026-11-04 14:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 <[email protected]>
Co-authored-by: Claudio Nicora <[email protected]>
Co-committed-by: Claudio Nicora <[email protected]>
This commit is contained in:
Claudio Nicora authored and Jason Song committed 2024-03-25 15:43:14 +08:00
1 parent f1213213d8
commit b4edc952d9
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
pkg/runner/run_context.go
+1 -1
View File
@@ -649,7 +649,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