summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-08-29 13:34:03 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-09-04 14:36:57 +0000
commit1ac1c5402795151c484ca7a51267b690f3b2681a (patch)
treea92238f8bdc284c12b84965a41464e703c4578cc /cmd/podman
parent8ca67d2794b22d293dc7a896f8a3285787cd7d39 (diff)
downloadpodman-1ac1c5402795151c484ca7a51267b690f3b2681a.tar.gz
podman-1ac1c5402795151c484ca7a51267b690f3b2681a.tar.bz2
podman-1ac1c5402795151c484ca7a51267b690f3b2681a.zip
rootless, create: support --pod
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1372 Approved by: mheon
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/create.go14
-rw-r--r--cmd/podman/main.go1
2 files changed, 14 insertions, 1 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 586368e24..04f3cd9e6 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -99,6 +99,10 @@ func createCmd(c *cli.Context) error {
storageOpts.UIDMap = mappings.UIDMap
storageOpts.GIDMap = mappings.GIDMap
+ if os.Getuid() != 0 {
+ rootless.SetSkipStorageSetup(true)
+ }
+
runtime, err := libpodruntime.GetRuntimeWithStorageOpts(c, &storageOpts)
if err != nil {
return errors.Wrapf(err, "error creating libpod runtime")
@@ -110,7 +114,7 @@ func createCmd(c *cli.Context) error {
imageName := ""
var data *inspect.ImageData = nil
- if rootfs == "" {
+ if rootfs == "" && !rootless.SkipStorageSetup() {
newImage, err := runtime.ImageRuntime().New(ctx, c.Args()[0], rtc.SignaturePolicyPath, "", os.Stderr, nil, image.SigningOptions{}, false, false)
if err != nil {
return err
@@ -133,6 +137,14 @@ func createCmd(c *cli.Context) error {
return err
}
+ became, ret, err := joinOrCreateRootlessUserNamespace(createConfig, runtime)
+ if err != nil {
+ return err
+ }
+ if became {
+ os.Exit(ret)
+ }
+
ctr, err := runtime.NewContainer(ctx, runtimeSpec, options...)
if err != nil {
return err
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 7960fc277..9d8d212b8 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -28,6 +28,7 @@ var (
var cmdsNotRequiringRootless = map[string]bool{
"help": true,
"version": true,
+ "create": true,
"exec": true,
// `info` must be executed in an user namespace.
// If this change, please also update libpod.refreshRootless()