summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-01 21:21:22 -0400
committerGitHub <noreply@github.com>2020-10-01 21:21:22 -0400
commit54a9ecc2629093ca58050a8f7418908bc209cec5 (patch)
treefb7e042da61d9e200b8cc26da2d4cb240daf92d9
parenta88f404fe132020d1572a9eee0f0492f941f6ec8 (diff)
parentbaede7cd2776b1f722dcbb65cff6228eeab5db44 (diff)
downloadpodman-54a9ecc2629093ca58050a8f7418908bc209cec5.tar.gz
podman-54a9ecc2629093ca58050a8f7418908bc209cec5.tar.bz2
podman-54a9ecc2629093ca58050a8f7418908bc209cec5.zip
Merge pull request #7871 from rhatdan/gid
Add additionalGIDs from users in rootless mode
-rw-r--r--libpod/container_internal_linux.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index dde7cafb1..eba732d2a 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -415,8 +415,9 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
}
// Look up and add groups the user belongs to, if a group wasn't directly specified
- if !rootless.IsRootless() && !strings.Contains(c.config.User, ":") {
+ if !strings.Contains(c.config.User, ":") {
for _, gid := range execUser.Sgids {
+ // FIXME: We need to add a flag to containers.conf to not add these for HPC Users.
g.AddProcessAdditionalGid(uint32(gid))
}
}