toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33621 from thaJeztah/fix-runc-version-exec

Browse Source 
Fix missing "--version" argument
Upstream-commit: 5052986afc43788ce96604ea5aa2e441a11b1a89
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-06-13 14:18:17 +02:00
committed by GitHub
parent a10bff4186 bf95ed2bb9
commit 25eae686e2
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/info_unix.go
+1 -1
View File
@@ -38,7 +38,7 @@ func (daemon *Daemon) FillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
v.RuncCommit.Expected = dockerversion.RuncCommitID
defaultRuntimeBinary := daemon.configStore.GetRuntime(daemon.configStore.GetDefaultRuntimeName()).Path
if rv, err := exec.Command(defaultRuntimeBinary).Output(); err == nil {
if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil {
parts := strings.Split(strings.TrimSpace(string(rv)), "\n")
if len(parts) == 3 {
parts = strings.Split(parts[1], ": ")