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: validate API configuration as part of --validate

Browse source 
Previously, the API server configuration would be initialized and
validated when starting the API. Because of this, invalid configuration
(e.g. missing or invalid TLS certificates) would not be detected
when using `dockerd --validate`.

This patch moves creation of the validation earlier, so that it's
validated as part of `dockerd --validate`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-04-21 10:34:32 +02:00
parent e16c3616e2
commit 0603f87fab
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/dockerd/daemon.go
View file

@ -85,6 +85,11 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
return err return err
} }
serverConfig, err := newAPIServerConfig(cli.Config)
if err != nil {
return err
}
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")
@ -159,10 +164,6 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
} }
} }
serverConfig, err := newAPIServerConfig(cli.Config)
if err != nil {
return errors.Wrap(err, "failed to create API server")
}
cli.api = apiserver.New(serverConfig) cli.api = apiserver.New(serverConfig)
hosts, err := loadListeners(cli, serverConfig) hosts, err := loadListeners(cli, serverConfig)