Fix tini version parsing

Invalid version strings for the init (tini)
binary were still accepted, which lead to (e.g.)

"hello world"

Being used as "vhello world"

This makes the version parsing slightly stricter

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 984d99e19cd5fbc6889528c9588f4875e3c40cc5
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-04-07 17:08:54 +02:00
parent 072232e704
commit e48f925bda

View File

@ -69,7 +69,7 @@ func (daemon *Daemon) FillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
v.InitCommit.Expected = dockerversion.InitCommitID[0:len(v.InitCommit.ID)]
}
}
if v.InitCommit.ID == "" && len(parts) >= 1 {
if v.InitCommit.ID == "" && strings.HasPrefix(parts[0], "tini version") {
vs := strings.TrimPrefix(parts[0], "tini version ")
v.InitCommit.ID = "v" + vs
}