oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-09-05 18:40:59 +00:00
Code Wiki Activity

fix: ensure unique container names for reusable workflows

Browse source
This commit is contained in:
Earl Warren 2025-08-13 18:48:38 +02:00
parent 886bf2a4f3
commit 026f1ed16c
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
act/runner/run_context.go
View file

@ -97,7 +97,7 @@ func (rc *RunContext) GetEnv() map[string]string {
}
func (rc *RunContext) jobContainerName() string {
return createSimpleContainerName(rc.Config.ContainerNamePrefix, "WORKFLOW-"+common.Sha256(rc.Run.Workflow.Name), "JOB-"+rc.Name)
return createSimpleContainerName(rc.Config.ContainerNamePrefix, "WORKFLOW-"+common.Sha256(rc.String()), "JOB-"+rc.Name)
}
func getDockerDaemonSocketMountPath(daemonPath string) string {

6
act/runner/run_context_test.go
View file

@ -794,7 +794,7 @@ jobs:
},
inputs: []container.NewContainerInput{
{
Name: "WORKFLOW-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855_JOB",
Name: "WORKFLOW-8a5edab282632443219e051e4ade2d1d5bbc671c781051bf1437897cbdfea0f1_JOB",
Image: "some:image",
Username: "containerusername",
Password: "containerpassword",
@ -814,7 +814,7 @@ jobs:
JobOptions: "",
},
{
Name: "WORKFLOW-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca49599-fe7f4c0058dbd2161ebe4aafa71cd83bd96ee19d3ca8043d5e4bc477a664a80c",
Name: "WORKFLOW-8a5edab282632443219e051e4ade2d1d5bbc671c781051bf143789-d083efaebdcab24d231fa091b85dbb8768b47136582b340132c197d9cb5e7430",
Image: "service1:image",
Username: "service1username",
Password: "service1password",
@ -834,7 +834,7 @@ jobs:
JobOptions: "",
},
{
Name: "WORKFLOW-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca49599-c233cf913e1d0c90cc1404ee09917e625f9cb82156ca3d7cb10b729d563728ea",
Name: "WORKFLOW-8a5edab282632443219e051e4ade2d1d5bbc671c781051bf143789-4c44cd5731ec445ebe33780a3e39ed5e20e80f8a697a6e34c7acdd3675e631a8",
Image: "service2:image",
Username: "service2username",
Password: "service2password",