JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #491 from frezbo/feature/fix-datatype-mismatch 

Fixing mismatch
docker-18.09
Tõnis Tiigi 2018-07-06 11:53:14 -07:00 committed by GitHub
parent 5b45a79b73 8753e76a4d
commit 77e4fcd0ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/rootless/specconv/specconv_linux.go
View File

@ -63,7 +63,7 @@ func configureUserNS(spec *specs.Spec, uidMap, gidMap []user.IDMap) error {
ContainerID: uint32(uNextContainerID),
Size: uint32(u.Count),
})
uNextContainerID += u.Count
uNextContainerID += int64(u.Count)
}
sort.Slice(gidMap, func(i, j int) bool { return gidMap[i].ID < gidMap[j].ID })
gNextContainerID := int64(0)
@ -74,7 +74,7 @@ func configureUserNS(spec *specs.Spec, uidMap, gidMap []user.IDMap) error {
ContainerID: uint32(gNextContainerID),
Size: uint32(g.Count),
})
gNextContainerID += g.Count
gNextContainerID += int64(g.Count)
}
return nil
}