Browse code

Update runc to fix hang during start and exec

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Michael Crosby authored on 2018/01/24 05:02:31
Showing 3 changed files
... ...
@@ -3,7 +3,7 @@
3 3
 TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
4 4
 
5 5
 # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
6
-RUNC_COMMIT=7f24b40cc5423969b4554ef04ba0b00e2b4ba010
6
+RUNC_COMMIT=9f9c96235cc97674e935002fc3d78361b696a69e
7 7
 
8 8
 # containerd is also pinned in vendor.conf. When updating the binary
9 9
 # version you may also need to update the vendor version to pick up bug
... ...
@@ -66,7 +66,7 @@ github.com/pborman/uuid v1.0
66 66
 google.golang.org/grpc v1.3.0
67 67
 
68 68
 # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly
69
-github.com/opencontainers/runc 7f24b40cc5423969b4554ef04ba0b00e2b4ba010
69
+github.com/opencontainers/runc 9f9c96235cc97674e935002fc3d78361b696a69e
70 70
 github.com/opencontainers/runtime-spec v1.0.1
71 71
 github.com/opencontainers/image-spec v1.0.1
72 72
 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
... ...
@@ -134,3 +134,14 @@ func RunningInUserNS() bool {
134 134
 func SetSubreaper(i int) error {
135 135
 	return unix.Prctl(PR_SET_CHILD_SUBREAPER, uintptr(i), 0, 0, 0)
136 136
 }
137
+
138
+// GetSubreaper returns the subreaper setting for the calling process
139
+func GetSubreaper() (int, error) {
140
+	var i uintptr
141
+
142
+	if err := unix.Prctl(unix.PR_GET_CHILD_SUBREAPER, uintptr(unsafe.Pointer(&i)), 0, 0, 0); err != nil {
143
+		return -1, err
144
+	}
145
+
146
+	return int(i), nil
147
+}