From 29aa7e15bd4fab7cbf823bd7f9c735f899d22ddc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 19 Feb 2025 17:22:33 +0100 Subject: [PATCH] cmd/dockerd: rewrite getSwarmRunRoot to a regular func This method only required the config to be passed; rewrite it to a regular func that accepts the config. Signed-off-by: Sebastiaan van Stijn --- cmd/dockerd/daemon.go | 2 +- cmd/dockerd/daemon_unix.go | 4 ++-- cmd/dockerd/daemon_windows.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index 442b67ae72..b04d47fc81 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -941,7 +941,7 @@ func createAndStartCluster(cli *daemonCLI, d *daemon.Daemon) (*cluster.Cluster, DefaultAdvertiseAddr: cli.Config.SwarmDefaultAdvertiseAddr, RaftHeartbeatTick: cli.Config.SwarmRaftHeartbeatTick, RaftElectionTick: cli.Config.SwarmRaftElectionTick, - RuntimeRoot: cli.getSwarmRunRoot(), + RuntimeRoot: getSwarmRunRoot(cli.Config), }) if err != nil { return nil, err diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go index 028c68d806..0b3322e292 100644 --- a/cmd/dockerd/daemon_unix.go +++ b/cmd/dockerd/daemon_unix.go @@ -66,8 +66,8 @@ func (cli *daemonCLI) setupConfigReloadTrap() { // getSwarmRunRoot gets the root directory for swarm to store runtime state // For example, the control socket -func (cli *daemonCLI) getSwarmRunRoot() string { - return filepath.Join(cli.Config.ExecRoot, "swarm") +func getSwarmRunRoot(cfg *config.Config) string { + return filepath.Join(cfg.ExecRoot, "swarm") } // allocateDaemonPort ensures that there are no containers diff --git a/cmd/dockerd/daemon_windows.go b/cmd/dockerd/daemon_windows.go index 7e19c3e782..7cc7ecb523 100644 --- a/cmd/dockerd/daemon_windows.go +++ b/cmd/dockerd/daemon_windows.go @@ -88,7 +88,7 @@ func (cli *daemonCLI) setupConfigReloadTrap() { // getSwarmRunRoot gets the root directory for swarm to store runtime state // For example, the control socket -func (cli *daemonCLI) getSwarmRunRoot() string { +func getSwarmRunRoot(*config.Config) string { return "" }