summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-28 19:19:12 +0200
committerGitHub <noreply@github.com>2020-04-28 19:19:12 +0200
commit8f57f312d6c22b0c7c25f415872177f2ef9a0c7e (patch)
treeeb38c62b41bb19d52a2ce42dcc648067d595440f /pkg
parent4ed125f7b5228b3e5898e23fbb91d6db8b9a6c18 (diff)
parente8e00133c1624a772434cd23d8e976a803b0cc15 (diff)
downloadpodman-8f57f312d6c22b0c7c25f415872177f2ef9a0c7e.tar.gz
podman-8f57f312d6c22b0c7c25f415872177f2ef9a0c7e.tar.bz2
podman-8f57f312d6c22b0c7c25f415872177f2ef9a0c7e.zip
Merge pull request #6020 from giuseppe/fix-exec
v2, podman: fix create tests
Diffstat (limited to 'pkg')
-rw-r--r--pkg/specgen/generate/container.go7
1 files changed, 0 insertions, 7 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index b27dd1cc2..75e8d8191 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -126,13 +126,6 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
if err != nil {
return err
}
-
- // TODO This should be enabled when namespaces actually work
- //case usernsMode.IsKeepID():
- // user = fmt.Sprintf("%d:%d", rootless.GetRootlessUID(), rootless.GetRootlessGID())
- if len(s.User) == 0 {
- s.User = "0"
- }
}
if err := finishThrottleDevices(s); err != nil {
return err