diff options
| author | Earl Warren <contact@earl-warren.org> | 2024-11-15 22:33:36 +0100 |
|---|---|---|
| committer | Earl Warren <contact@earl-warren.org> | 2024-11-15 22:48:56 +0100 |
| commit | b33e155709383ad77a3bbd73306e0ab643a3d35a (patch) | |
| tree | 30a2441f97011b329f0f7b0818a8424950b7b9af /internal | |
| parent | Merge pull request 'Update golang packages to v1.23 (minor)' (#330) from reno... (diff) | |
| download | forgejo-runner-b33e155709383ad77a3bbd73306e0ab643a3d35a.tar.xz forgejo-runner-b33e155709383ad77a3bbd73306e0ab643a3d35a.zip | |
fix: make container.docker_host default to - (part two)
If --config is not specified, the default must also be "-" and not ""
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/pkg/config/config.go | 4 | ||||
| -rw-r--r-- | internal/pkg/config/config_test.go | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/internal/pkg/config/config.go b/internal/pkg/config/config.go index 5ab177d..60be651 100644 --- a/internal/pkg/config/config.go +++ b/internal/pkg/config/config.go @@ -153,6 +153,10 @@ func LoadDefault(file string) (*Config, error) { cfg.Runner.ReportInterval = time.Second } + if cfg.Container.DockerHost == "" { + cfg.Container.DockerHost = "-" + } + // although `container.network_mode` will be deprecated, but we have to be compatible with it for now. if cfg.Container.NetworkMode != "" && cfg.Container.Network == "" { log.Warn("You are trying to use deprecated configuration item of `container.network_mode`, please use `container.network` instead.") diff --git a/internal/pkg/config/config_test.go b/internal/pkg/config/config_test.go index af3ebf7..2f046c0 100644 --- a/internal/pkg/config/config_test.go +++ b/internal/pkg/config/config_test.go @@ -40,5 +40,6 @@ func TestDefaultSettings(t *testing.T) { config, err := LoadDefault("") assert.NoError(t, err) + assert.EqualValues(t, config.Container.DockerHost, "-") assert.EqualValues(t, config.Log.JobLevel, "info") } |