summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--RELEASE-NOTES.md1
-rw-r--r--internal/pkg/config/config.go4
-rw-r--r--internal/pkg/config/config_test.go1
3 files changed, 6 insertions, 0 deletions
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 01fcf39..2ced7f3 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -2,6 +2,7 @@
## 5.0.0
+* Breaking change: the default configuration for `docker_host` is changed to [not mounting the docker server socket](https://code.forgejo.org/forgejo/runner/pulls/305) even when no configuration file is provided.
* [Add job_level logging option to config](https://code.forgejo.org/forgejo/runner/pulls/299) to make the logging level of jobs configurable. Change default from "trace" to "info".
* [Don't log job output when debug logging is not enabled](https://code.forgejo.org/forgejo/runner/pulls/303). This reduces the default amount of log output of the runner.
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")
}