Преглед на файлове

Change version parsing to support alternate runtimes

Signed-off-by: Carlos de Paula <me@carlosedp.com>
Carlos de Paula преди 5 години
родител
ревизия
4ab1e808d1
променени са 2 файла, в които са добавени 11 реда и са изтрити 2 реда
  1. 3 2
      daemon/info_unix.go
  2. 8 0
      daemon/info_unix_test.go

+ 3 - 2
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:") {

+ 8 - 0
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,