From ecec1a5430885baf96d2e3d6153c7454c41a4617 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 13 Sep 2018 12:16:14 -0400
Subject: Remove duplicate code between create.go and run.go

Create two new createInit for checking if the cotnainer is initialized
correctly.
createContainer which creates the actual container and containerConfig

Also added libpodruntime.GetContainerRuntime to put common runtime code
into separate function.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/create.go | 73 ++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 36 deletions(-)

(limited to 'cmd/podman/create.go')

diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index bc010d047..c246b7903 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -57,6 +57,26 @@ var createCommand = cli.Command{
 }
 
 func createCmd(c *cli.Context) error {
+	if err := createInit(c); err != nil {
+		return err
+	}
+
+	runtime, err := libpodruntime.GetContainerRuntime(c)
+	if err != nil {
+		return errors.Wrapf(err, "error creating libpod runtime")
+	}
+	defer runtime.Shutdown(false)
+
+	ctr, _, err := createContainer(c, runtime)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("%s\n", ctr.ID())
+	return nil
+}
+
+func createInit(c *cli.Context) error {
 	// TODO should allow user to create based off a directory on the host not just image
 	// Need CLI support for this
 
@@ -83,63 +103,46 @@ func createCmd(c *cli.Context) error {
 		return errors.Errorf("image name or ID is required")
 	}
 
+	return nil
+}
+
+func createContainer(c *cli.Context, runtime *libpod.Runtime) (*libpod.Container, *cc.CreateConfig, error) {
+	rtc := runtime.GetConfig()
+	ctx := getContext()
 	rootfs := ""
 	if c.Bool("rootfs") {
 		rootfs = c.Args()[0]
 	}
 
-	mappings, err := util.ParseIDMapping(c.StringSlice("uidmap"), c.StringSlice("gidmap"), c.String("subuidmap"), c.String("subgidmap"))
-	if err != nil {
-		return err
-	}
-	storageOpts, err := libpodruntime.GetDefaultStoreOptions()
-	if err != nil {
-		return err
-	}
-	storageOpts.UIDMap = mappings.UIDMap
-	storageOpts.GIDMap = mappings.GIDMap
-
-	if os.Geteuid() != 0 {
-		rootless.SetSkipStorageSetup(true)
-	}
-
-	runtime, err := libpodruntime.GetRuntimeWithStorageOpts(c, &storageOpts)
-	if err != nil {
-		return errors.Wrapf(err, "error creating libpod runtime")
-	}
-	defer runtime.Shutdown(false)
-
-	rtc := runtime.GetConfig()
-	ctx := getContext()
-
 	imageName := ""
 	var data *inspect.ImageData = nil
+
 	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
+			return nil, nil, err
 		}
 		data, err = newImage.Inspect(ctx)
 		imageName = newImage.Names()[0]
 	}
 	createConfig, err := parseCreateOpts(ctx, c, runtime, imageName, data)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
 	runtimeSpec, err := cc.CreateConfigToOCISpec(createConfig)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
 	options, err := createConfig.GetContainerCreateOptions(runtime)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
 	became, ret, err := joinOrCreateRootlessUserNamespace(createConfig, runtime)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 	if became {
 		os.Exit(ret)
@@ -147,27 +150,25 @@ func createCmd(c *cli.Context) error {
 
 	ctr, err := runtime.NewContainer(ctx, runtimeSpec, options...)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
 	createConfigJSON, err := json.Marshal(createConfig)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 	if err := ctr.AddArtifact("create-config", createConfigJSON); err != nil {
-		return err
+		return nil, nil, err
 	}
 
-	logrus.Debug("new container created ", ctr.ID())
-
 	if c.String("cidfile") != "" {
 		err := libpod.WriteFile(ctr.ID(), c.String("cidfile"))
 		if err != nil {
 			logrus.Error(err)
 		}
 	}
-	fmt.Printf("%s\n", ctr.ID())
-	return nil
+	logrus.Debugf("New container created %q", ctr.ID())
+	return ctr, createConfig, nil
 }
 
 // Checks if a user-specified AppArmor profile is loaded, or loads the default profile if
-- 
cgit v1.2.3-54-g00ecf