opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-08 14:48:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

rootless, create: support --pod

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1372
Approved by: mheon
This commit is contained in:
Giuseppe Scrivano
2018-08-29 13:34:03 +02:00
committed by Atomic Bot
parent 8ca67d2794
commit 1ac1c54027
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/podman/create.go
View File

@@ -99,6 +99,10 @@ func createCmd(c *cli.Context) error {
storageOpts.UIDMap = mappings.UIDMap storageOpts.UIDMap = mappings.UIDMap
storageOpts.GIDMap = mappings.GIDMap storageOpts.GIDMap = mappings.GIDMap
if os.Getuid() != 0 {
rootless.SetSkipStorageSetup(true)
}
runtime, err := libpodruntime.GetRuntimeWithStorageOpts(c, &storageOpts) runtime, err := libpodruntime.GetRuntimeWithStorageOpts(c, &storageOpts)
if err != nil { if err != nil {
return errors.Wrapf(err, "error creating libpod runtime") return errors.Wrapf(err, "error creating libpod runtime")
@@ -110,7 +114,7 @@ func createCmd(c *cli.Context) error {
imageName := "" imageName := ""
var data *inspect.ImageData = nil 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) newImage, err := runtime.ImageRuntime().New(ctx, c.Args()[0], rtc.SignaturePolicyPath, "", os.Stderr, nil, image.SigningOptions{}, false, false)
if err != nil { if err != nil {
return err return err
@@ -133,6 +137,14 @@ func createCmd(c *cli.Context) error {
return err 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...) ctr, err := runtime.NewContainer(ctx, runtimeSpec, options...)
if err != nil { if err != nil {
return err return err

1
cmd/podman/main.go
View File

@@ -28,6 +28,7 @@ var (
var cmdsNotRequiringRootless = map[string]bool{ var cmdsNotRequiringRootless = map[string]bool{
"help": true, "help": true,
"version": true, "version": true,
"create": true,
"exec": true, "exec": true,
// `info` must be executed in an user namespace. // `info` must be executed in an user namespace.
// If this change, please also update libpod.refreshRootless() // If this change, please also update libpod.refreshRootless()