Default to io.containerd.runc.v2

robertgzr · lmbarros · commit cd0ca50fe417 · 2023-08-30T17:09:02.000-04:00
runc.v1 was deprecated with the 20.10 major release of moby

Change-type: patch
Signed-off-by: Robert Günzler &lt;robertg@balena.io&gt;
diff --git a/daemon/runtime_unix.go b/daemon/runtime_unix.go
@@ -38,7 +38,7 @@ func configureRuntimes(conf *config.Config) {
 	}
 	conf.Runtimes[config.LinuxV1RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV1ShimConfig(conf, defaultRuntimeName)}
 	conf.Runtimes[config.LinuxV2RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV2ShimConfig(conf, defaultRuntimeName)}
-	conf.Runtimes[config.StockRuntimeName] = conf.Runtimes[config.LinuxV1RuntimeName]
+	conf.Runtimes[config.StockRuntimeName] = conf.Runtimes[config.LinuxV2RuntimeName]
 }
 
 func defaultV2ShimConfig(conf *config.Config, runtimePath string) *types.ShimConfig {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ func configureRuntimes(conf *config.Config) {`
`38`	`38`	`}`
`39`	`39`	`conf.Runtimes[config.LinuxV1RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV1ShimConfig(conf, defaultRuntimeName)}`
`40`	`40`	`conf.Runtimes[config.LinuxV2RuntimeName] = types.Runtime{Path: defaultRuntimeName, Shim: defaultV2ShimConfig(conf, defaultRuntimeName)}`
`41`		`- conf.Runtimes[config.StockRuntimeName] = conf.Runtimes[config.LinuxV1RuntimeName]`
	`41`	`+ conf.Runtimes[config.StockRuntimeName] = conf.Runtimes[config.LinuxV2RuntimeName]`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func defaultV2ShimConfig(conf config.Config, runtimePath string) types.ShimConfig {`