gitea/act_runner
3
0
Fork 0
mirror of https://gitea.com/gitea/act_runner.git synced 2025-06-12 17:47:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move docker.host to container.docker_host (#244)

Browse Source 
Follow #242.

Move `docker.host` to `container.docker_host`.

There are already some options for docker/container in `container`, so developers could get confused about where to add options.

It's breaking, but I think it's OK since `docker.host` was added just two days ago.

Reviewed-on: https://gitea.com/gitea/act_runner/pulls/244
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Jason Song
2023-06-19 09:01:16 +00:00
parent 9e4a5f7363
commit 054c8d912f
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/pkg/config/config.go
View File

@ -48,11 +48,7 @@ type Container struct {
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.
}
// Docker represents the configuration for Docker.
type Docker struct {
Host string `yaml:"host"` // Host specifies the Docker host.
DockerHost string `yaml:"docker_host"` // DockerHost specifies the Docker host. It overrides the value specified in environment variable DOCKER_HOST.
}
// Config represents the overall configuration.
@ -61,7 +57,6 @@ type Config struct {
Runner Runner `yaml:"runner"` // Runner represents the configuration for the runner.
Cache Cache `yaml:"cache"` // Cache represents the configuration for caching.
Container Container `yaml:"container"` // Container represents the configuration for the container.
Docker Docker `yaml:"docker"` // Docker represents the configuration for Docker.
}
// LoadDefault returns the default configuration.