diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-14 09:31:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 09:31:20 -0500 |
| commit | 803c078d3b844339c5fca0088ffcb759b6256b9b (patch) | |
| tree | 88995ef03341d5ba30435b241a42c85cf6e037ed /cmd | |
| parent | e5741b984ed438e4c716eec67c83b3c927a97ebb (diff) | |
| parent | f711f5a68de98b911ef31676843e6d463cc47f69 (diff) | |
| download | podman-803c078d3b844339c5fca0088ffcb759b6256b9b.tar.gz podman-803c078d3b844339c5fca0088ffcb759b6256b9b.tar.bz2 podman-803c078d3b844339c5fca0088ffcb759b6256b9b.zip | |
Merge pull request #8693 from giuseppe/drop-valid-id-in-userns-check
podman: drop checking valid rootless UID
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers/run.go | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index 6ff1b929d..46bfb4143 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -3,7 +3,6 @@ package containers import ( "fmt" "os" - "strconv" "strings" "github.com/containers/common/pkg/completion" @@ -15,7 +14,6 @@ import ( "github.com/containers/podman/v2/pkg/errorhandling" "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/podman/v2/pkg/specgen" - "github.com/containers/podman/v2/pkg/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -108,15 +106,6 @@ func run(cmd *cobra.Command, args []string) error { return err } - if rootless.IsRootless() && !registry.IsRemote() { - userspec := strings.SplitN(cliVals.User, ":", 2)[0] - if uid, err := strconv.ParseInt(userspec, 10, 32); err == nil { - if err := util.CheckRootlessUIDRange(int(uid)); err != nil { - return err - } - } - } - if af := cliVals.Authfile; len(af) > 0 { if _, err := os.Stat(af); err != nil { return err |