summaryrefslogtreecommitdiffstats
path: root/internal/pkg/envcheck/docker.go
diff options
context:
space:
mode:
authorEarl Warren <contact@earl-warren.org>2024-11-27 01:28:35 +0100
committerEarl Warren <contact@earl-warren.org>2024-11-27 02:36:18 +0100
commit279faefa0828619322c3ff1ed3c2dd0db8fb138d (patch)
tree1fe8a29359b92500f139940fbca813facc2fcd01 /internal/pkg/envcheck/docker.go
parentMerge pull request 'Update module github.com/stretchr/testify to v1.10.0' (#3... (diff)
downloadforgejo-runner-279faefa0828619322c3ff1ed3c2dd0db8fb138d.tar.xz
forgejo-runner-279faefa0828619322c3ff1ed3c2dd0db8fb138d.zip
fix: [container].docker_host = "" is now "automount"
The empty string is always replaced with "-" and there no longer is any way to specify that the docker socket is to be mounted in the container automatically. The "automount" value is introduced as a replacement. https://code.forgejo.org/forgejo/act/pulls/67 and https://code.forgejo.org/forgejo/runner/pulls/305 introduced this regression.
Diffstat (limited to '')
-rw-r--r--internal/pkg/envcheck/docker.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/internal/pkg/envcheck/docker.go b/internal/pkg/envcheck/docker.go
index f115bc7..cb9c901 100644
--- 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...)