commit 6bc38cc88392ec7ce52774d36c0b635570aac129
Author: Daniel J Walsh <dwalsh@redhat.com>
Date: Sun Jul 15 06:42:33 2018 -0400
Update vendor for runc to fix 32 bit builds
Current runc builds will not build on 32 bit systems
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go
index 8d353d98..a4ae8901 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go
@@ -123,8 +123,8 @@ func UIDMapInUserNS(uidmap []user.IDMap) bool {
}
// GetParentNSeuid returns the euid within the parent user namespace
-func GetParentNSeuid() int {
- euid := os.Geteuid()
+func GetParentNSeuid() int64 {
+ euid := int64(os.Geteuid())
uidmap, err := user.CurrentProcessUIDMap()
if err != nil {
// This kernel-provided file only exists if user namespaces are supported
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go
index 37993da8..7b912bbf 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go
@@ -78,15 +78,15 @@ func groupFromOS(g *user.Group) (Group, error) {
// SubID represents an entry in /etc/sub{u,g}id
type SubID struct {
Name string
- SubID int
- Count int
+ SubID int64
+ Count int64
}
// IDMap represents an entry in /proc/PID/{u,g}id_map
type IDMap struct {
- ID int
- ParentID int
- Count int
+ ID int64
+ ParentID int64
+ Count int64
}
func parseLine(line string, v ...interface{}) {
@@ -113,6 +113,8 @@ func parseParts(parts []string, v ...interface{}) {
case *int:
// "numbers", with conversion errors ignored because of some misbehaving configuration files.
*e, _ = strconv.Atoi(p)
+ case *int64:
+ *e, _ = strconv.ParseInt(p, 10, 64)
case *[]string:
// Comma-separated lists.
if p != "" {
@@ -122,7 +124,7 @@ func parseParts(parts []string, v ...interface{}) {
}
default:
// Someone goof'd when writing code using this function. Scream so they can hear us.
- panic(fmt.Sprintf("parseLine only accepts {*string, *int, *[]string} as arguments! %#v is not a pointer!", e))
+ panic(fmt.Sprintf("parseLine only accepts {*string, *int, *int64, *[]string} as arguments! %#v is not a pointer!", e))
}
}
}