Merge pull request #663 from runcom/fix-arch-goos

oci: fix type mismatch on some platform/arch

oci/finished.go

@@ -0,0 +1,14 @@
+// +build !arm !386
+
+package oci
+
+import (
+	"os"
+	"syscall"
+	"time"
+)
+
+func getFinishedTime(fi os.FileInfo) time.Time {
+	st := fi.Sys().(*syscall.Stat_t)
+	return time.Unix(st.Ctim.Sec, st.Ctim.Nsec)
+}

oci/finished_32.go

@@ -0,0 +1,14 @@
+// +build arm 386
+
+package oci
+
+import (
+	"os"
+	"syscall"
+	"time"
+)
+
+func getFinishedTime(fi os.FileInfo) time.Time {
+	st := fi.Sys().(*syscall.Stat_t)
+	return time.Unix(int64(st.Ctim.Sec), int64(st.Ctim.Nsec))
+}

oci/oci.go

@@ -585,9 +585,7 @@ func (r *Runtime) UpdateStatus(c *Container) error {
 			logrus.Warnf("failed to find container exit file: %v", err)
 			c.state.ExitCode = -1
 		} else {
-			st := fi.Sys().(*syscall.Stat_t)
+			c.state.Finished = getFinishedTime(fi)
-			c.state.Finished = time.Unix(st.Ctim.Sec, st.Ctim.Nsec)
-
 			statusCodeStr, err := ioutil.ReadFile(exitFilePath)
 			if err != nil {
 				return fmt.Errorf("failed to read exit file: %v", err)