diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2022-06-05 21:05:15 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2022-06-29 19:55:05 +0200 |
| commit | 0281f50efa52b211746f290f900b12619fdc7c83 (patch) | |
| tree | 7f8a1ccb0f749b1a775bee97685aed7239d74d76 /cmd | |
| parent | 717a503590f5b864ee467d3d8e825748570d6e4b (diff) | |
cmd/dockerd: move setting defaults to loadDaemonCliConfig()
Move changes to follow, but this moves the code to a more logical place.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dockerd/daemon.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index b7c6d30462..7edd2e91e5 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -76,8 +76,6 @@ func NewDaemonCli() *DaemonCli { } func (cli *DaemonCli) start(opts *daemonOptions) (err error) { - opts.setDefaultOptions() - if cli.Config, err = loadDaemonCliConfig(opts); err != nil { return err } @@ -92,7 +90,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) { if opts.Validate { // If config wasn't OK we wouldn't have made it this far. - fmt.Fprintln(os.Stderr, "configuration OK") + _, _ = fmt.Fprintln(os.Stderr, "configuration OK") return nil } @@ -386,6 +384,8 @@ func shutdownDaemon(d *daemon.Daemon) { } func loadDaemonCliConfig(opts *daemonOptions) (*config.Config, error) { + opts.setDefaultOptions() + conf := opts.daemonConfig flags := opts.flags conf.Debug = opts.Debug |