yume/act_runner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
sillyguodong 2023-07-04 14:32:41 +08:00
parent 9917202ee6
commit ebde5995ff
No known key found for this signature in database
GPG key ID: 4A0646FA86256DF4
3 changed files with 13 additions and 12 deletions
go.mod
internal
app/run
runner.go
pkg/config
config.go

3
go.mod
View file

@ -89,4 +89,5 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
)
replace github.com/nektos/act => gitea.com/gitea/act v0.246.2-0.20230703034344-3813f40cba18
// replace github.com/nektos/act => gitea.com/gitea/act v0.246.2-0.20230703034344-3813f40cba18
replace github.com/nektos/act => ../act

2
internal/app/run/runner.go
View file

@ -201,7 +201,7 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
PlatformPicker: r.labels.PickPlatform,
Vars: task.Vars,
ValidVolumes: r.cfg.Container.ValidVolumes,
InheritDiverOpts: r.cfg.Container.InheritDiverOpts,
InheritDriverOpts: r.cfg.Container.InheritDriverOpts,
}
rr, err := runner.New(runnerConfig)

20
internal/pkg/config/config.go
View file

@ -42,14 +42,14 @@ type Cache struct {
// Container represents the configuration for the container.
type Container struct {
Network string `yaml:"network"` // Network specifies the network for the container.
InheritDiverOpts []string `yaml:"inherit_driver_opts"` // InheritDiverOpts indicates the network created by act_runner whether inherit the dirver options of the default bridge network.
NetworkMode string `yaml:"network_mode"` // Deprecated: use Network instead. Could be removed after Gitea 1.20
Privileged bool `yaml:"privileged"` // Privileged indicates whether the container runs in privileged mode.
Options string `yaml:"options"` // Options specifies additional options for the container.
WorkdirParent string `yaml:"workdir_parent"` // WorkdirParent specifies the parent directory for the container's working directory.
ValidVolumes []string `yaml:"valid_volumes"` // ValidVolumes specifies the volumes (including bind mounts) can be mounted to containers.
DockerHost string `yaml:"docker_host"` // DockerHost specifies the Docker host. It overrides the value specified in environment variable DOCKER_HOST.
Network string `yaml:"network"` // Network specifies the network for the container.
InheritDriverOpts []string `yaml:"inherit_driver_opts"` // InheritDiverOpts indicates the network created by act_runner whether inherit the dirver options of the default bridge network.
NetworkMode string `yaml:"network_mode"` // Deprecated: use Network instead. Could be removed after Gitea 1.20
Privileged bool `yaml:"privileged"` // Privileged indicates whether the container runs in privileged mode.
Options string `yaml:"options"` // Options specifies additional options for the container.
WorkdirParent string `yaml:"workdir_parent"` // WorkdirParent specifies the parent directory for the container's working directory.
ValidVolumes []string `yaml:"valid_volumes"` // ValidVolumes specifies the volumes (including bind mounts) can be mounted to containers.
DockerHost string `yaml:"docker_host"` // DockerHost specifies the Docker host. It overrides the value specified in environment variable DOCKER_HOST.
}
// Host represents the configuration for the host.
@ -143,12 +143,12 @@ func LoadDefault(file string) (*Config, error) {
}
var cleanDriverOptKeys []string
for _, key := range cfg.Container.InheritDiverOpts {
for _, key := range cfg.Container.InheritDriverOpts {
if _, ok := validDriverOptKeysMap[key]; ok {
cleanDriverOptKeys = append(cleanDriverOptKeys, key)
}
}
cfg.Container.InheritDiverOpts = cleanDriverOptKeys
cfg.Container.InheritDriverOpts = cleanDriverOptKeys
return cfg, nil
}