3 files changed, 199 insertions, 1 deletions
diff --git a/cmd/podmanV2/common/create.go b/cmd/podmanV2/common/create.go
index f81d021c8..e2eb8cbda 100644
--- a/cmd/podmanV2/common/create.go
+++ b/cmd/podmanV2/common/create.go
@@ -29,7 +29,6 @@ func getDefaultContainerConfig() *config.Config {
 }
 
 func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
-	//createFlags := c.Flags()
 	createFlags := pflag.FlagSet{}
 	createFlags.StringSliceVar(
 		&cf.Annotation,
diff --git a/cmd/podmanV2/containers/run.go b/cmd/podmanV2/containers/run.go
new file mode 100644
index 000000000..bd90aee2f
--- /dev/null
+++ b/cmd/podmanV2/containers/run.go
@@ -0,0 +1,125 @@
+package containers
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/sirupsen/logrus"
+
+	"github.com/containers/libpod/pkg/domain/entities"
+
+	"github.com/containers/libpod/cmd/podmanV2/common"
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/specgen"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	runDescription = "Runs a command in a new container from the given image"
+	runCommand     = &cobra.Command{
+		Use:     "run [flags] IMAGE [COMMAND [ARG...]]",
+		Short:   "Run a command in a new container",
+		Long:    runDescription,
+		PreRunE: preRunE,
+		RunE:    run,
+		Example: `podman run imageID ls -alF /etc
+  podman run --network=host imageID dnf -y install java
+  podman run --volume /var/hostdir:/var/ctrdir -i -t fedora /bin/bash`,
+	}
+)
+
+var (
+	runOpts = entities.ContainerRunOptions{
+		OutputStream: os.Stdout,
+		InputStream:  os.Stdin,
+		ErrorStream:  os.Stderr,
+	}
+	runRmi bool
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode},
+		Command: runCommand,
+	})
+	flags := runCommand.Flags()
+	flags.AddFlagSet(common.GetCreateFlags(&cliVals))
+	flags.AddFlagSet(common.GetNetFlags())
+	flags.SetNormalizeFunc(common.AliasFlags)
+	flags.BoolVar(&runOpts.SigProxy, "sig-proxy", true, "Proxy received signals to the process")
+	flags.BoolVar(&runRmi, "rmi", false, "Remove container image unless used by other containers")
+	if registry.IsRemote() {
+		_ = flags.MarkHidden("authfile")
+	}
+}
+
+func run(cmd *cobra.Command, args []string) error {
+	var (
+		err error
+	)
+	cliVals.Net, err = common.NetFlagsToNetOptions(cmd)
+	if err != nil {
+		return err
+	}
+	if af := cliVals.Authfile; len(af) > 0 {
+		if _, err := os.Stat(af); err != nil {
+			return errors.Wrapf(err, "error checking authfile path %s", af)
+		}
+	}
+	runOpts.Rm = cliVals.Rm
+	if err := createInit(cmd); err != nil {
+		return err
+	}
+
+	// If -i is not set, clear stdin
+	if !cliVals.Interactive {
+		runOpts.InputStream = nil
+	}
+
+	// If attach is set, clear stdin/stdout/stderr and only attach requested
+	if cmd.Flag("attach").Changed {
+		runOpts.OutputStream = nil
+		runOpts.ErrorStream = nil
+		if !cliVals.Interactive {
+			runOpts.InputStream = nil
+		}
+
+		for _, stream := range cliVals.Attach {
+			switch strings.ToLower(stream) {
+			case "stdout":
+				runOpts.OutputStream = os.Stdout
+			case "stderr":
+				runOpts.ErrorStream = os.Stderr
+			case "stdin":
+				runOpts.InputStream = os.Stdin
+			default:
+				return errors.Wrapf(define.ErrInvalidArg, "invalid stream %q for --attach - must be one of stdin, stdout, or stderr", stream)
+			}
+		}
+	}
+	runOpts.Detach = cliVals.Detach
+	runOpts.DetachKeys = cliVals.DetachKeys
+	s := specgen.NewSpecGenerator(args[0])
+	if err := common.FillOutSpecGen(s, &cliVals, args); err != nil {
+		return err
+	}
+	runOpts.Spec = s
+	report, err := registry.ContainerEngine().ContainerRun(registry.GetContext(), runOpts)
+	if err != nil {
+		return err
+	}
+	if cliVals.Detach {
+		fmt.Println(report.Id)
+	}
+	registry.SetExitCode(report.ExitCode)
+	if runRmi {
+		_, err := registry.ImageEngine().Delete(registry.GetContext(), []string{report.Id}, entities.ImageDeleteOptions{})
+		if err != nil {
+			logrus.Errorf("%s", errors.Wrapf(err, "failed removing image"))
+		}
+	}
+	return nil
+}
diff --git a/cmd/podmanV2/system/info.go b/cmd/podmanV2/system/info.go
new file mode 100644
index 000000000..69b2871b7
--- /dev/null
+++ b/cmd/podmanV2/system/info.go
@@ -0,0 +1,74 @@
+package system
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"text/template"
+
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/spf13/cobra"
+	"gopkg.in/yaml.v2"
+)
+
+var (
+	infoDescription = `Display information pertaining to the host, current storage stats, and build of podman.
+
+  Useful for the user and when reporting issues.
+`
+	infoCommand = &cobra.Command{
+		Use:     "info",
+		Args:    cobra.NoArgs,
+		Long:    infoDescription,
+		Short:   "Display podman system information",
+		PreRunE: preRunE,
+		RunE:    info,
+		Example: `podman info`,
+	}
+)
+
+var (
+	inFormat string
+	debug    bool
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: infoCommand,
+	})
+	flags := infoCommand.Flags()
+	flags.BoolVarP(&debug, "debug", "D", false, "Display additional debug information")
+	flags.StringVarP(&inFormat, "format", "f", "", "Change the output format to JSON or a Go template")
+}
+
+func info(cmd *cobra.Command, args []string) error {
+	info, err := registry.ContainerEngine().Info(registry.GetContext())
+	if err != nil {
+		return err
+	}
+
+	if inFormat == "json" {
+		b, err := json.MarshalIndent(info, "", "  ")
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(b))
+		return nil
+	}
+	if !cmd.Flag("format").Changed {
+		b, err := yaml.Marshal(info)
+		if err != nil {
+			return err
+		}
+		fmt.Println(string(b))
+		return nil
+	}
+	tmpl, err := template.New("info").Parse(inFormat)
+	if err != nil {
+		return err
+	}
+	err = tmpl.Execute(os.Stdout, info)
+	return err
+}