actions
/
runner
mirror of https://code.forgejo.org/forgejo/runner
1
0
Fork 0
Code Packages

fix: set more image

pull/2/head
Jason Song 2022-11-22 17:14:00 +08:00
parent 66ec50e427
commit 64c9856ba7
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
runtime/task.go
View File

@ -99,12 +99,32 @@ func getWorkflowsPath(dir string) (string, error) {
return p, nil return p, nil
} }
func demoPlatforms() map[string]string { func platformPicker(labels []string) string {
return map[string]string{
// FIXME: read custom labels
preset := map[string]string{
// FIXME: shouldn't be the same
"ubuntu-latest": "node:16-buster", "ubuntu-latest": "node:16-buster",
"ubuntu-22.04": "node:16-buster",
"ubuntu-20.04": "node:16-buster", "ubuntu-20.04": "node:16-buster",
"ubuntu-18.04": "node:16-buster", "ubuntu-18.04": "node:16-buster",
} }
for _, label := range labels {
if v, ok := preset[label]; ok {
return v
}
}
// TODO: support multiple labels
// like:
// ["ubuntu-22.04"] => "ubuntu:22.04"
// ["with-gpu"] => "linux:with-gpu"
// ["ubuntu-22.04", "with-gpu"] => "ubuntu:22.04_with-gpu"
// FIXME: shall we need to support default?
return "node:16-buster"
} }
func getToken(task *runnerv1.Task) string { func getToken(task *runnerv1.Task) string {
@ -209,7 +229,6 @@ func (t *Task) Run(ctx context.Context, task *runnerv1.Task) error {
Env: input.envs, Env: input.envs,
Secrets: task.Secrets, Secrets: task.Secrets,
InsecureSecrets: input.insecureSecrets, InsecureSecrets: input.insecureSecrets,
Platforms: demoPlatforms(), // TODO: supported platforms
Privileged: input.privileged, Privileged: input.privileged,
UsernsMode: input.usernsMode, UsernsMode: input.usernsMode,
ContainerArchitecture: input.containerArchitecture, ContainerArchitecture: input.containerArchitecture,
@ -228,6 +247,7 @@ func (t *Task) Run(ctx context.Context, task *runnerv1.Task) error {
ContainerMaxLifetime: 3 * time.Hour, // maybe should be specified by Gitea server ContainerMaxLifetime: 3 * time.Hour, // maybe should be specified by Gitea server
ContainerNetworkMode: input.containerNetworkMode, ContainerNetworkMode: input.containerNetworkMode,
DefaultActionInstance: dataContext["gitea_default_bots_url"].GetStringValue(), DefaultActionInstance: dataContext["gitea_default_bots_url"].GetStringValue(),
PlatformPicker: platformPicker,
} }
r, err := runner.New(config) r, err := runner.New(config)
if err != nil { if err != nil {