From 4ab1e808d12ca3a9787a18b450be4530fa5a1cd9 Mon Sep 17 00:00:00 2001 From: Carlos de Paula Date: Mon, 16 Sep 2019 21:13:01 -0300 Subject: [PATCH] Change version parsing to support alternate runtimes Signed-off-by: Carlos de Paula --- daemon/info_unix.go | 5 +++-- daemon/info_unix_test.go | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/daemon/info_unix.go b/daemon/info_unix.go index 89f349e31e..0e30de0f9f 100644 --- a/daemon/info_unix.go +++ b/daemon/info_unix.go @@ -233,8 +233,9 @@ func parseInitVersion(v string) (version string, commit string, err error) { func parseRuncVersion(v string) (version string, commit string, err error) { lines := strings.Split(strings.TrimSpace(v), "\n") for _, line := range lines { - if strings.HasPrefix(line, "runc version") { - version = strings.TrimSpace(strings.TrimPrefix(line, "runc version")) + if strings.Contains(line, "version") { + s := strings.Split(line, "version") + version = strings.TrimSpace(s[len(s)-1]) continue } if strings.HasPrefix(line, "commit:") { diff --git a/daemon/info_unix_test.go b/daemon/info_unix_test.go index 7b61960262..c890c59db4 100644 --- a/daemon/info_unix_test.go +++ b/daemon/info_unix_test.go @@ -80,6 +80,14 @@ spec: 1.0.0 `, commit: "69663f0bd4b60df09991c08812a60108003fa340", }, + { + output: ` +crun version 0.7 +spec: 1.0.0 ++SYSTEMD +SELINUX +CAP +SECCOMP +EBPF +YAJL +`, + version: "0.7", + }, { output: "", invalid: true,