Merge pull request 'fix: [container].docker_host = "" is now "automou…

…nt"' (#354) from earl-warren/runner:wip-config into main Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/354 Reviewed-by: Michael Kriese <[email protected]>
Crown0815 · Nov 27, 2024 · f8b0ccf · f8b0ccf
2 parents eee0b08 + 279faef
commit f8b0ccf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 5.0.3
+
+* [Fixes a regression](https://code.forgejo.org/forgejo/runner/pulls/354) that was introduced in version 5.0.0 by which it was no longer possible to mount the docker socket in each container by specifying `[container].docker_host = ""`. This is now implemented when `[container].docker_host = "automount"` is specified.
+
 ## 5.0.2
 
 * Fixes a regression that was introduced in version 5.0.0 by which [skipped jobs were marked as failed instead](https://code.forgejo.org/forgejo/act/pulls/67). The workaround is to change the job log level to debug `[log].job_level: debug`.

diff --git a/internal/app/cmd/daemon.go b/internal/app/cmd/daemon.go
@@ -73,11 +73,8 @@ func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command,
 			if err := envcheck.CheckIfDockerRunning(ctx, dockerSocketPath); err != nil {
 				return err
 			}
-			// if dockerSocketPath passes the check, override DOCKER_HOST with dockerSocketPath
 			os.Setenv("DOCKER_HOST", dockerSocketPath)
-			// empty cfg.Container.DockerHost means act_runner need to find an available docker host automatically
-			// and assign the path to cfg.Container.DockerHost
-			if cfg.Container.DockerHost == "" {
+			if cfg.Container.DockerHost == "automount" {
 				cfg.Container.DockerHost = dockerSocketPath
 			}
 			// check the scheme, if the scheme is not npipe or unix
@@ -186,7 +183,7 @@ var commonSocketPaths = []string{
 
 func getDockerSocketPath(configDockerHost string) (string, error) {
 	// a `-` means don't mount the docker socket to job containers
-	if configDockerHost != "" && configDockerHost != "-" {
+	if configDockerHost != "automount" && configDockerHost != "-" {
 		return configDockerHost, nil
 	}
 

diff --git a/internal/pkg/config/config.example.yaml b/internal/pkg/config/config.example.yaml
@@ -89,8 +89,8 @@ container:
   #   - '**'
   valid_volumes: []
   # overrides the docker client host with the specified one.
-  # If "-", an available docker host will automatically be found.
-  # If empty, an available docker host will automatically be found and mounted in the job container (e.g. /var/run/docker.sock).
+  # If "-" or "", an available docker host will automatically be found.
+  # If "automount", an available docker host will automatically be found and mounted in the job container (e.g. /var/run/docker.sock).
   # Otherwise the specified docker host will be used and an error will be returned if it doesn't work.
   docker_host: "-"
   # Pull docker image(s) even if already present

diff --git a/internal/pkg/envcheck/docker.go b/internal/pkg/envcheck/docker.go
@@ -13,10 +13,7 @@ import (
 func CheckIfDockerRunning(ctx context.Context, configDockerHost string) error {
 	opts := []client.Opt{
 		client.FromEnv,
-	}
-
-	if configDockerHost != "" {
-		opts = append(opts, client.WithHost(configDockerHost))
+		client.WithHost(configDockerHost),
 	}
 
 	cli, err := client.NewClientWithOpts(opts...)