Remove version-checks for containerd and runc
With containerd reaching 1.0, the runtime now has a stable API, so there's no need to do a check if the installed version matches the expected version. Current versions of Docker now also package containerd and runc separately, and can be _updated_ separately. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
71d1cc34c0
commit
c65f0bd13c
|
@ -29,7 +29,6 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
|
||||||
v.DefaultRuntime = daemon.configStore.GetDefaultRuntimeName()
|
v.DefaultRuntime = daemon.configStore.GetDefaultRuntimeName()
|
||||||
v.InitBinary = daemon.configStore.GetInitPath()
|
v.InitBinary = daemon.configStore.GetInitPath()
|
||||||
|
|
||||||
v.RuncCommit.Expected = dockerversion.RuncCommitID
|
|
||||||
defaultRuntimeBinary := daemon.configStore.GetRuntime(v.DefaultRuntime).Path
|
defaultRuntimeBinary := daemon.configStore.GetRuntime(v.DefaultRuntime).Path
|
||||||
if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil {
|
if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil {
|
||||||
parts := strings.Split(strings.TrimSpace(string(rv)), "\n")
|
parts := strings.Split(strings.TrimSpace(string(rv)), "\n")
|
||||||
|
@ -49,7 +48,10 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
|
||||||
v.RuncCommit.ID = "N/A"
|
v.RuncCommit.ID = "N/A"
|
||||||
}
|
}
|
||||||
|
|
||||||
v.ContainerdCommit.Expected = dockerversion.ContainerdCommitID
|
// runc is now shipped as a separate package. Set "expected" to same value
|
||||||
|
// as "ID" to prevent clients from reporting a version-mismatch
|
||||||
|
v.RuncCommit.Expected = v.RuncCommit.ID
|
||||||
|
|
||||||
if rv, err := daemon.containerd.Version(context.Background()); err == nil {
|
if rv, err := daemon.containerd.Version(context.Background()); err == nil {
|
||||||
v.ContainerdCommit.ID = rv.Revision
|
v.ContainerdCommit.ID = rv.Revision
|
||||||
} else {
|
} else {
|
||||||
|
@ -57,6 +59,10 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
|
||||||
v.ContainerdCommit.ID = "N/A"
|
v.ContainerdCommit.ID = "N/A"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// containerd is now shipped as a separate package. Set "expected" to same
|
||||||
|
// value as "ID" to prevent clients from reporting a version-mismatch
|
||||||
|
v.ContainerdCommit.Expected = v.ContainerdCommit.ID
|
||||||
|
|
||||||
defaultInitBinary := daemon.configStore.GetInitPath()
|
defaultInitBinary := daemon.configStore.GetInitPath()
|
||||||
if rv, err := exec.Command(defaultInitBinary, "--version").Output(); err == nil {
|
if rv, err := exec.Command(defaultInitBinary, "--version").Output(); err == nil {
|
||||||
ver, err := parseInitVersion(string(rv))
|
ver, err := parseInitVersion(string(rv))
|
||||||
|
|
|
@ -10,8 +10,6 @@ const (
|
||||||
Version = "library-import"
|
Version = "library-import"
|
||||||
BuildTime = "library-import"
|
BuildTime = "library-import"
|
||||||
IAmStatic = "library-import"
|
IAmStatic = "library-import"
|
||||||
ContainerdCommitID = "library-import"
|
|
||||||
RuncCommitID = "library-import"
|
|
||||||
InitCommitID = "library-import"
|
InitCommitID = "library-import"
|
||||||
PlatformName = ""
|
PlatformName = ""
|
||||||
ProductName = ""
|
ProductName = ""
|
||||||
|
|
|
@ -19,7 +19,6 @@ const (
|
||||||
Version string = "$VERSION"
|
Version string = "$VERSION"
|
||||||
BuildTime string = "$BUILDTIME"
|
BuildTime string = "$BUILDTIME"
|
||||||
IAmStatic string = "${IAMSTATIC:-true}"
|
IAmStatic string = "${IAMSTATIC:-true}"
|
||||||
ContainerdCommitID string = "${CONTAINERD_COMMIT}"
|
|
||||||
PlatformName string = "${PLATFORM}"
|
PlatformName string = "${PLATFORM}"
|
||||||
ProductName string = "${PRODUCT}"
|
ProductName string = "${PRODUCT}"
|
||||||
DefaultProductLicense string = "${DEFAULT_PRODUCT_LICENSE}"
|
DefaultProductLicense string = "${DEFAULT_PRODUCT_LICENSE}"
|
||||||
|
@ -37,7 +36,6 @@ package dockerversion
|
||||||
// Default build-time variable for library-import.
|
// Default build-time variable for library-import.
|
||||||
// This file is overridden on build with build-time information.
|
// This file is overridden on build with build-time information.
|
||||||
const (
|
const (
|
||||||
RuncCommitID string = "${RUNC_COMMIT}"
|
|
||||||
InitCommitID string = "${TINI_COMMIT}"
|
InitCommitID string = "${TINI_COMMIT}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue