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

Merge pull request #6654 from rhatdan/keepid 

Don't ignore --user flag in rootless --userns keepid
This commit is contained in:
OpenShift Merge Robot 2020-06-17 21:22:06 -04:00 committed by GitHub
parent 6e410ede70 c385e6d363
commit 6472b44c34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/specgen/generate/namespaces.go
View File

@ -153,9 +153,7 @@ func namespaceOptions(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.
// User // User
switch s.UserNS.NSMode { switch s.UserNS.NSMode {
case specgen.KeepID: case specgen.KeepID:
if rootless.IsRootless() { if !rootless.IsRootless() {
s.User = ""
} else {
// keep-id as root doesn't need a user namespace // keep-id as root doesn't need a user namespace
s.UserNS.NSMode = specgen.Host s.UserNS.NSMode = specgen.Host
} }

7
test/e2e/run_userns_test.go
View File

@ -89,6 +89,13 @@ var _ = Describe("Podman UserNS support", func() {
Expect(ok).To(BeTrue()) Expect(ok).To(BeTrue())
}) })
It("podman --userns=keep-id --user root:root", func() {
session := podmanTest.Podman([]string{"run", "--userns=keep-id", "--user", "root:root", "alpine", "id", "-u"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(Equal("0"))
})
It("podman --userns=auto", func() { It("podman --userns=auto", func() {
u, err := user.Current() u, err := user.Current()
Expect(err).To(BeNil()) Expect(err).To(BeNil())