diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-11 14:20:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-11 14:20:55 +0100 |
| commit | acf2e913730a27fcdc3fcd7c160aa19e071dde36 (patch) | |
| tree | f83d330839a23205743281faed9ddae29a4666e4 | |
| parent | 6d7d90e6262c2b146d8f09bb2c33ae7890cd1f64 (diff) | |
| parent | 41967e260195bb874a80b5457f0f2fa02aab6635 (diff) | |
| download | podman-acf2e913730a27fcdc3fcd7c160aa19e071dde36.tar.gz podman-acf2e913730a27fcdc3fcd7c160aa19e071dde36.tar.bz2 podman-acf2e913730a27fcdc3fcd7c160aa19e071dde36.zip | |
Merge pull request #2308 from giuseppe/pod-create-allow-rootless
pod: drop invalid check for rootless
| -rw-r--r-- | cmd/podman/pod_create.go | 4 | ||||
| -rw-r--r-- | libpod/oci.go | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/cmd/podman/pod_create.go b/cmd/podman/pod_create.go index 9ac5d94a9..35e58df31 100644 --- a/cmd/podman/pod_create.go +++ b/cmd/podman/pod_create.go @@ -9,7 +9,6 @@ import ( "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/rootless" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" @@ -82,9 +81,6 @@ func podCreateCmd(c *cliconfig.PodCreateValues) error { if !c.Infra { return errors.Errorf("you must have an infra container to publish port bindings to the host") } - if rootless.IsRootless() { - return errors.Errorf("rootless networking does not allow port binding to the host") - } } if !c.Infra && c.Flag("share").Changed && c.Share != "none" && c.Share != "" { diff --git a/libpod/oci.go b/libpod/oci.go index e55bd57dc..26d2c6ef1 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -321,7 +321,6 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res cmd.Env = append(cmd.Env, fmt.Sprintf("_LIBPOD_USERNS_CONFIGURED=%s", os.Getenv("_LIBPOD_USERNS_CONFIGURED"))) cmd.Env = append(cmd.Env, fmt.Sprintf("_LIBPOD_ROOTLESS_UID=%s", os.Getenv("_LIBPOD_ROOTLESS_UID"))) cmd.Env = append(cmd.Env, fmt.Sprintf("HOME=%s", os.Getenv("HOME"))) - cmd.Env = append(cmd.Env, fmt.Sprintf("XDG_RUNTIME_DIR=%s", runtimeDir)) if r.reservePorts && !ctr.config.NetMode.IsSlirp4netns() { ports, err := bindPorts(ctr.config.PortMappings) |