InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/dockerd: rewrite getContainerdDaemonOpts to a func

Browse Source 
This method only depended on the CLI config; rewrite it to a
regular function, returning the opts to use for the containerd
daemon.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-02-26 00:19:57 +01:00
parent b95fdcd084
commit dfecaaf908
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/dockerd/daemon.go
View File

@@ -766,19 +766,19 @@ func initMiddlewares(_ context.Context, s *apiserver.Server, cfg *config.Config,
return authzMiddleware, nil
}
func (cli *daemonCLI) getContainerdDaemonOpts() ([]supervisor.DaemonOpt, error) {
func getContainerdDaemonOpts(cfg *config.Config) ([]supervisor.DaemonOpt, error) {
var opts []supervisor.DaemonOpt
if cli.Debug {
if cfg.Debug {
opts = append(opts, supervisor.WithLogLevel("debug"))
} else {
opts = append(opts, supervisor.WithLogLevel(cli.LogLevel))
opts = append(opts, supervisor.WithLogLevel(cfg.LogLevel))
}
if logFormat := cli.Config.LogFormat; logFormat != "" {
if logFormat := cfg.LogFormat; logFormat != "" {
opts = append(opts, supervisor.WithLogFormat(logFormat))
}
if !cli.CriContainerd {
if !cfg.CriContainerd {
// CRI support in the managed daemon is currently opt-in.
//
// It's disabled by default, originally because it was listening on
@@ -1045,7 +1045,7 @@ func (cli *daemonCLI) initializeContainerd(ctx context.Context) (func(time.Durat
}
log.G(ctx).Info("containerd not running, starting managed containerd")
opts, err := cli.getContainerdDaemonOpts()
opts, err := getContainerdDaemonOpts(cli.Config)
if err != nil {
return nil, errors.Wrap(err, "failed to generate containerd options")
}