From 054c8d912fc81683c643dddc58daca6f72f1a849 Mon Sep 17 00:00:00 2001
From: Jason Song <i@wolfogre.com>
Date: Mon, 19 Jun 2023 09:01:16 +0000
Subject: [PATCH] Move `docker.host` to `container.docker_host` (#244)

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>
---
 internal/pkg/config/config.example.yaml | 4 +---
 internal/pkg/config/config.go           | 7 +------
 internal/pkg/envcheck/docker.go         | 8 ++++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/internal/pkg/config/config.example.yaml b/internal/pkg/config/config.example.yaml
index 46bf295..9b8f656 100644
--- a/internal/pkg/config/config.example.yaml
+++ b/internal/pkg/config/config.example.yaml
@@ -68,9 +68,7 @@ container:
   # valid_volumes:
   #   - '**'
   valid_volumes: []
-
-docker:
   # overrides the docker client host with the specified one.
   # default value is the value of DOCKER_HOST environment variable.
   # if DOCKER_HOST is not set, the default value is unix:///var/run/docker.sock
-  host: ""
+  docker_host: ""
diff --git a/internal/pkg/config/config.go b/internal/pkg/config/config.go
index 11ebd16..15835b1 100644
--- a/internal/pkg/config/config.go
+++ b/internal/pkg/config/config.go
@@ -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.
diff --git a/internal/pkg/envcheck/docker.go b/internal/pkg/envcheck/docker.go
index c657fec..af7fe97 100644
--- a/internal/pkg/envcheck/docker.go
+++ b/internal/pkg/envcheck/docker.go
@@ -7,9 +7,9 @@ import (
 	"context"
 	"fmt"
 
-	"gitea.com/gitea/act_runner/internal/pkg/config"
-
 	"github.com/docker/docker/client"
+
+	"gitea.com/gitea/act_runner/internal/pkg/config"
 )
 
 func CheckIfDockerRunning(ctx context.Context, cfg *config.Config) error {
@@ -17,8 +17,8 @@ func CheckIfDockerRunning(ctx context.Context, cfg *config.Config) error {
 		client.FromEnv,
 	}
 
-	if cfg.Docker.Host != "" {
-		opts = append(opts, client.WithHost(cfg.Docker.Host))
+	if cfg.Container.DockerHost != "" {
+		opts = append(opts, client.WithHost(cfg.Container.DockerHost))
 	}
 
 	cli, err := client.NewClientWithOpts(opts...)