From bf07c06c6365d9ea14ecdacaae698c42bcf9fd10 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 9 Nov 2020 16:24:14 +0100 Subject: [PATCH] daemon: move DefaultShimBinary, DefaultRuntimeBinary to config package Signed-off-by: Sebastiaan van Stijn --- cmd/dockerd/daemon_unix.go | 4 ++-- daemon/config/config.go | 7 ++++++- daemon/daemon_unix.go | 8 -------- daemon/reload_unix.go | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go index 2500260028..e70ff13da1 100644 --- a/cmd/dockerd/daemon_unix.go +++ b/cmd/dockerd/daemon_unix.go @@ -65,8 +65,8 @@ func (cli *DaemonCli) getPlatformContainerdDaemonOpts() ([]supervisor.DaemonOpt, opts := []supervisor.DaemonOpt{ supervisor.WithOOMScore(cli.Config.OOMScoreAdjust), supervisor.WithPlugin("linux", &linux.Config{ - Shim: daemon.DefaultShimBinary, - Runtime: daemon.DefaultRuntimeBinary, + Shim: config.DefaultShimBinary, + Runtime: config.DefaultRuntimeBinary, RuntimeRoot: filepath.Join(cli.Config.Root, "runc"), ShimDebug: cli.Config.Debug, }), diff --git a/daemon/config/config.go b/daemon/config/config.go index 4990727597..0a9050f151 100644 --- a/daemon/config/config.go +++ b/daemon/config/config.go @@ -44,7 +44,12 @@ const ( DisableNetworkBridge = "none" // DefaultInitBinary is the name of the default init binary DefaultInitBinary = "docker-init" - + // DefaultShimBinary is the default shim to be used by containerd if none + // is specified + DefaultShimBinary = "containerd-shim" + // DefaultRuntimeBinary is the default runtime to be used by + // containerd if none is specified + DefaultRuntimeBinary = "runc" // StockRuntimeName is the reserved name/alias used to represent the // OCI runtime being shipped with the docker daemon package. StockRuntimeName = "runc" diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index dda2647a34..e0db99621f 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -57,14 +57,6 @@ import ( const ( isWindows = false - // DefaultShimBinary is the default shim to be used by containerd if none - // is specified - DefaultShimBinary = "containerd-shim" - - // DefaultRuntimeBinary is the default runtime to be used by - // containerd if none is specified - DefaultRuntimeBinary = "runc" - // See https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/tree/kernel/sched/sched.h?id=8cd9234c64c584432f6992fe944ca9e46ca8ea76#n269 linuxMinCPUShares = 2 linuxMaxCPUShares = 262144 diff --git a/daemon/reload_unix.go b/daemon/reload_unix.go index 02ae20a1cd..d8571a5ad1 100644 --- a/daemon/reload_unix.go +++ b/daemon/reload_unix.go @@ -19,7 +19,7 @@ func (daemon *Daemon) reloadPlatform(conf *config.Config, attributes map[string] if conf.IsValueSet("runtimes") { // Always set the default one - conf.Runtimes[config.StockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary} + conf.Runtimes[config.StockRuntimeName] = types.Runtime{Path: config.DefaultRuntimeBinary} if err := daemon.initRuntimes(conf.Runtimes); err != nil { return err }