mirror of
https://github.com/containers/podman
synced 2024-10-20 01:03:51 +00:00
Merge pull request #6654 from rhatdan/keepid
Don't ignore --user flag in rootless --userns keepid
This commit is contained in:
commit
6472b44c34
|
@ -153,9 +153,7 @@ func namespaceOptions(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.
|
|||
// User
|
||||
switch s.UserNS.NSMode {
|
||||
case specgen.KeepID:
|
||||
if rootless.IsRootless() {
|
||||
s.User = ""
|
||||
} else {
|
||||
if !rootless.IsRootless() {
|
||||
// keep-id as root doesn't need a user namespace
|
||||
s.UserNS.NSMode = specgen.Host
|
||||
}
|
||||
|
|
|
@ -89,6 +89,13 @@ var _ = Describe("Podman UserNS support", func() {
|
|||
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() {
|
||||
u, err := user.Current()
|
||||
Expect(err).To(BeNil())
|
||||
|
|
Loading…
Reference in a new issue