nprasad2077/runner
1
0 Fork 0
mirror of https://gitea.com/gitea/runner.git synced 2026-11-07 07:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve container sleep through PATH (#1255)

Browse Source 
Resolve the job container's sleep command through PATH so images with nonstandard binary locations, including Nix, can run jobs.

Closes https://gitea.com/gitea/runner/issues/808

---------

Co-authored-by: silverwind <[email protected]>
Reviewed-on: https://gitea.com/gitea/runner/pulls/1255
Reviewed-by: silverwind <[email protected]>
This commit is contained in:
bircniandsilverwind committed 2026-09-29 18:44:57 +00:00
1 parent bf03f36d5a
commit 4a8ee4ce57
2 files changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

act/runner/run_context.go
+1 -1
View File
@@ -575,7 +575,7 @@ func (rc *RunContext) startJobContainer() common.Executor {
ext := container.LinuxContainerEnvironmentExtensions{} ext := container.LinuxContainerEnvironmentExtensions{}
containerInput := &container.NewContainerInput{ containerInput := &container.NewContainerInput{
Cmd: nil, Cmd: nil,
Entrypoint: []string{"/bin/sleep", fmt.Sprint(rc.Config.ContainerMaxLifetime.Round(time.Second).Seconds())}, Entrypoint: []string{"sleep", fmt.Sprint(rc.Config.ContainerMaxLifetime.Round(time.Second).Seconds())},
WorkingDir: ext.ToContainerPath(rc.Config.Workdir), WorkingDir: ext.ToContainerPath(rc.Config.Workdir),
Image: image, Image: image,
Username: username, Username: username,
act/runner/run_context_test.go
+2 -1
View File
@@ -343,7 +343,7 @@ jobs:
require.Nil(t, redis.Cmd) require.Nil(t, redis.Cmd)
} }
func TestStartJobContainerEvaluatesContainersOnceAndTrimsDockerPrefix(t *testing.T) { func TestStartJobContainerBuildsEvaluatedJobAndServiceInputs(t *testing.T) {
inputs := startJobContainerInputs(t, ` inputs := startJobContainerInputs(t, `
jobs: jobs:
job: job:
@@ -359,6 +359,7 @@ jobs:
require.Equal(t, []string{"/entry.sh"}, redis.Entrypoint) require.Equal(t, []string{"/entry.sh"}, redis.Entrypoint)
require.Equal(t, []string{"redis-server", "--port", "6380"}, redis.Cmd) require.Equal(t, []string{"redis-server", "--port", "6380"}, redis.Cmd)
require.Equal(t, "node:20", job.Image) require.Equal(t, "node:20", job.Image)
require.Equal(t, "sleep", job.Entrypoint[0])
require.Equal(t, "--label ${{ github.job }}", job.WorkflowOptions) require.Equal(t, "--label ${{ github.job }}", job.WorkflowOptions)
require.Equal(t, "${{ vars.TITLE }}", job.Password) require.Equal(t, "${{ vars.TITLE }}", job.Password)
} }