From 6e30a4cc0c1c8b46543602ae320cfcd8cd4a6117 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 26 Feb 2025 00:11:59 +0100 Subject: [PATCH] cmd/dockerd: explicitly access Config fields Explicitly access config field through the Config field, instead of the top-level "cli". This allows spotting locations where we don't depend on the CLI, but really just the Config. Signed-off-by: Sebastiaan van Stijn --- cmd/dockerd/daemon.go | 6 +++--- cmd/dockerd/daemon_unix.go | 2 +- cmd/dockerd/daemon_windows.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index fa232c3562..ae7d436a56 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -1040,7 +1040,7 @@ func (cli *daemonCLI) initializeContainerd(ctx context.Context) (func(time.Durat } if ok { // detected a system containerd at the given address. - cli.ContainerdAddr = systemContainerdAddr + cli.Config.ContainerdAddr = systemContainerdAddr return nil, nil } @@ -1050,11 +1050,11 @@ func (cli *daemonCLI) initializeContainerd(ctx context.Context) (func(time.Durat return nil, errors.Wrap(err, "failed to generate containerd options") } - r, err := supervisor.Start(ctx, filepath.Join(cli.Root, "containerd"), filepath.Join(cli.ExecRoot, "containerd"), opts...) + r, err := supervisor.Start(ctx, filepath.Join(cli.Config.Root, "containerd"), filepath.Join(cli.Config.ExecRoot, "containerd"), opts...) if err != nil { return nil, errors.Wrap(err, "failed to start containerd") } - cli.ContainerdAddr = r.Address() + cli.Config.ContainerdAddr = r.Address() // Try to wait for containerd to shutdown return r.WaitTimeout, nil diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go index 0b3322e292..bfd0dce866 100644 --- a/cmd/dockerd/daemon_unix.go +++ b/cmd/dockerd/daemon_unix.go @@ -115,7 +115,7 @@ func newCgroupParent(cfg *config.Config) string { } func (cli *daemonCLI) initContainerd(ctx context.Context) (func(time.Duration) error, error) { - if cli.ContainerdAddr != "" { + if cli.Config.ContainerdAddr != "" { // use system containerd at the given address. return nil, nil } diff --git a/cmd/dockerd/daemon_windows.go b/cmd/dockerd/daemon_windows.go index 7cc7ecb523..e340dbfa2f 100644 --- a/cmd/dockerd/daemon_windows.go +++ b/cmd/dockerd/daemon_windows.go @@ -101,13 +101,13 @@ func newCgroupParent(*config.Config) string { } func (cli *daemonCLI) initContainerd(ctx context.Context) (func(time.Duration) error, error) { - defer func() { system.EnableContainerdRuntime(cli.ContainerdAddr) }() + defer func() { system.EnableContainerdRuntime(cli.Config.ContainerdAddr) }() - if cli.ContainerdAddr != "" { + if cli.Config.ContainerdAddr != "" { return nil, nil } - if cli.DefaultRuntime != config.WindowsV2RuntimeName { + if cli.Config.DefaultRuntime != config.WindowsV2RuntimeName { return nil, nil }