kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

cmd/dockerd: move setting defaults to loadDaemonCliConfig()

Browse source 
Move changes to follow, but this moves the code to a more logical place.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-06-05 21:05:15 +02:00
parent 717a503590
commit 0281f50efa
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/dockerd/daemon.go
View file

@ -76,8 +76,6 @@ func NewDaemonCli() *DaemonCli {
} }
func (cli *DaemonCli) start(opts *daemonOptions) (err error) { func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
opts.setDefaultOptions()
if cli.Config, err = loadDaemonCliConfig(opts); err != nil { if cli.Config, err = loadDaemonCliConfig(opts); err != nil {
return err return err
} }
@ -92,7 +90,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
if opts.Validate { if opts.Validate {
// If config wasn't OK we wouldn't have made it this far. // 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 return nil
} }
@ -386,6 +384,8 @@ func shutdownDaemon(d *daemon.Daemon) {
} }
func loadDaemonCliConfig(opts *daemonOptions) (*config.Config, error) { func loadDaemonCliConfig(opts *daemonOptions) (*config.Config, error) {
opts.setDefaultOptions()
conf := opts.daemonConfig conf := opts.daemonConfig
flags := opts.flags flags := opts.flags
conf.Debug = opts.Debug conf.Debug = opts.Debug