From 0b6bb6a3d3c3c15b9c6629a6949a616a30b0478a Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 22 Apr 2019 16:01:31 -0500 Subject: enable podman-remote on windows build a podman-remote binary for windows that allows users to use the remote client on windows and interact with podman on linux system. Signed-off-by: baude --- cmd/podman/main.go | 20 +++----------------- cmd/podman/main_local.go | 27 ++++++++++++++++++++++++--- cmd/podman/main_remote.go | 6 ++++++ 3 files changed, 33 insertions(+), 20 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/main.go b/cmd/podman/main.go index a0f1cf401..f501ee674 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -4,7 +4,6 @@ import ( "context" "io" "os" - "syscall" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod" @@ -13,7 +12,6 @@ import ( "github.com/containers/libpod/version" "github.com/containers/storage/pkg/reexec" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -118,25 +116,13 @@ func before(cmd *cobra.Command, args []string) error { } logrus.SetLevel(level) - rlimits := new(syscall.Rlimit) - rlimits.Cur = 1048576 - rlimits.Max = 1048576 - if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil { - if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil { - return errors.Wrapf(err, "error getting rlimits") - } - rlimits.Cur = rlimits.Max - if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil { - return errors.Wrapf(err, "error setting new rlimits") - } + if err := setRLimits(); err != nil { + return err } - if rootless.IsRootless() { logrus.Info("running as rootless") } - - // Be sure we can create directories with 0755 mode. - syscall.Umask(0022) + setUMask() return profileOn(cmd) } diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go index 5afd51e28..7452965a2 100644 --- a/cmd/podman/main_local.go +++ b/cmd/podman/main_local.go @@ -4,16 +4,17 @@ package main import ( "context" - "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/cmd/podman/libpodruntime" - "github.com/containers/libpod/pkg/rootless" "io/ioutil" "log/syslog" "os" "runtime/pprof" "strconv" "strings" + "syscall" + "github.com/containers/libpod/cmd/podman/cliconfig" + "github.com/containers/libpod/cmd/podman/libpodruntime" + "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/tracing" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" @@ -154,3 +155,23 @@ func setupRootless(cmd *cobra.Command, args []string) error { } return nil } +func setRLimits() error { + rlimits := new(syscall.Rlimit) + rlimits.Cur = 1048576 + rlimits.Max = 1048576 + if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil { + if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil { + return errors.Wrapf(err, "error getting rlimits") + } + rlimits.Cur = rlimits.Max + if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil { + return errors.Wrapf(err, "error setting new rlimits") + } + } + return nil +} + +func setUMask() { + // Be sure we can create directories with 0755 mode. + syscall.Umask(0022) +} diff --git a/cmd/podman/main_remote.go b/cmd/podman/main_remote.go index 2a7d184cd..a3335050a 100644 --- a/cmd/podman/main_remote.go +++ b/cmd/podman/main_remote.go @@ -41,3 +41,9 @@ func setupRootless(cmd *cobra.Command, args []string) error { } return nil } + +func setRLimits() error { + return nil +} + +func setUMask() {} -- cgit v1.2.3-54-g00ecf