From 585f2963aaef6e54aedf33122498d1e772cc90fd Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 11 Feb 2019 10:19:00 +0100 Subject: pod: drop not valid check for rootless rootless networks support port binding if the underlying slirp4netns is new enough. Signed-off-by: Giuseppe Scrivano --- cmd/podman/pod_create.go | 4 ---- 1 file changed, 4 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 != "" { -- cgit v1.2.3-54-g00ecf From 41967e260195bb874a80b5457f0f2fa02aab6635 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 11 Feb 2019 12:38:05 +0100 Subject: oci: do not set XDG_RUNTIME_DIR twice we are doing it few lines above. Signed-off-by: Giuseppe Scrivano --- libpod/oci.go | 1 - 1 file changed, 1 deletion(-) 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) -- cgit v1.2.3-54-g00ecf