4 files changed, 155 insertions, 2 deletions
diff --git a/cmd/podmanV2/common/create.go b/cmd/podmanV2/common/create.go
index 724ed2f42..f81d021c8 100644
--- a/cmd/podmanV2/common/create.go
+++ b/cmd/podmanV2/common/create.go
@@ -138,7 +138,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet {
 	)
 	createFlags.StringVar(
 		&cf.DetachKeys,
-		"detach-keys", getDefaultDetachKeys(),
+		"detach-keys", GetDefaultDetachKeys(),
 		"Override the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-cf`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`",
 	)
 	createFlags.StringSliceVar(
diff --git a/cmd/podmanV2/common/default.go b/cmd/podmanV2/common/default.go
index fea161edf..b71fcb6f0 100644
--- a/cmd/podmanV2/common/default.go
+++ b/cmd/podmanV2/common/default.go
@@ -116,6 +116,6 @@ func getDefaultPidsDescription() string {
 	return "Tune container pids limit (set 0 for unlimited)"
 }
 
-func getDefaultDetachKeys() string {
+func GetDefaultDetachKeys() string {
 	return defaultContainerConfig.Engine.DetachKeys
 }
diff --git a/cmd/podmanV2/containers/attach.go b/cmd/podmanV2/containers/attach.go
new file mode 100644
index 000000000..d62dcff86
--- /dev/null
+++ b/cmd/podmanV2/containers/attach.go
@@ -0,0 +1,60 @@
+package containers
+
+import (
+	"os"
+
+	"github.com/containers/libpod/cmd/podmanV2/common"
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	attachDescription = "The podman attach command allows you to attach to a running container using the container's ID or name, either to view its ongoing output or to control it interactively."
+	attachCommand     = &cobra.Command{
+		Use:   "attach [flags] CONTAINER",
+		Short: "Attach to a running container",
+		Long:  attachDescription,
+		RunE:  attach,
+		Args: func(cmd *cobra.Command, args []string) error {
+			if len(args) > 1 || (len(args) == 0 && !cmd.Flag("latest").Changed) {
+				return errors.Errorf("attach requires the name or id of one running container or the latest flag")
+			}
+			return nil
+		},
+		PreRunE: preRunE,
+		Example: `podman attach ctrID
+  podman attach 1234
+  podman attach --no-stdin foobar`,
+	}
+)
+
+var (
+	attachOpts entities.AttachOptions
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode},
+		Command: attachCommand,
+	})
+	flags := attachCommand.Flags()
+	flags.StringVar(&attachOpts.DetachKeys, "detach-keys", common.GetDefaultDetachKeys(), "Select the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-z`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`")
+	flags.BoolVar(&attachOpts.NoStdin, "no-stdin", false, "Do not attach STDIN. The default is false")
+	flags.BoolVar(&attachOpts.SigProxy, "sig-proxy", true, "Proxy received signals to the process")
+	flags.BoolVarP(&attachOpts.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
+	if registry.IsRemote() {
+		_ = flags.MarkHidden("latest")
+	}
+}
+
+func attach(cmd *cobra.Command, args []string) error {
+	attachOpts.Stdin = os.Stdin
+	if attachOpts.NoStdin {
+		attachOpts.Stdin = nil
+	}
+	attachOpts.Stdout = os.Stdout
+	attachOpts.Stderr = os.Stderr
+	return registry.ContainerEngine().ContainerAttach(registry.GetContext(), args[0], attachOpts)
+}
diff --git a/cmd/podmanV2/containers/exec.go b/cmd/podmanV2/containers/exec.go
new file mode 100644
index 000000000..4bff57dbb
--- /dev/null
+++ b/cmd/podmanV2/containers/exec.go
@@ -0,0 +1,93 @@
+package containers
+
+import (
+	"bufio"
+	"os"
+
+	"github.com/containers/libpod/cmd/podmanV2/common"
+	"github.com/containers/libpod/cmd/podmanV2/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	envLib "github.com/containers/libpod/pkg/env"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	execDescription = `Execute the specified command inside a running container.
+`
+	execCommand = &cobra.Command{
+		Use:     "exec [flags] CONTAINER [COMMAND [ARG...]]",
+		Short:   "Run a process in a running container",
+		Long:    execDescription,
+		PreRunE: preRunE,
+		RunE:    exec,
+		Example: `podman exec -it ctrID ls
+  podman exec -it -w /tmp myCtr pwd
+  podman exec --user root ctrID ls`,
+	}
+)
+
+var (
+	envInput, envFile []string
+	execOpts          entities.ExecOptions
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode},
+		Command: execCommand,
+	})
+	flags := execCommand.Flags()
+	flags.SetInterspersed(false)
+	flags.StringVar(&execOpts.DetachKeys, "detach-keys", common.GetDefaultDetachKeys(), "Select the key sequence for detaching a container. Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _")
+	flags.StringArrayVarP(&envInput, "env", "e", []string{}, "Set environment variables")
+	flags.StringSliceVar(&envFile, "env-file", []string{}, "Read in a file of environment variables")
+	flags.BoolVarP(&execOpts.Interactive, "interactive", "i", false, "Keep STDIN open even if not attached")
+	flags.BoolVarP(&execOpts.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
+	flags.BoolVar(&execOpts.Privileged, "privileged", false, "Give the process extended Linux capabilities inside the container.  The default is false")
+	flags.BoolVarP(&execOpts.Tty, "tty", "t", false, "Allocate a pseudo-TTY. The default is false")
+	flags.StringVarP(&execOpts.User, "user", "u", "", "Sets the username or UID used and optionally the groupname or GID for the specified command")
+	flags.UintVar(&execOpts.PreserveFDs, "preserve-fds", 0, "Pass N additional file descriptors to the container")
+	flags.StringVarP(&execOpts.WorkDir, "workdir", "w", "", "Working directory inside the container")
+	if registry.IsRemote() {
+		_ = flags.MarkHidden("latest")
+		_ = flags.MarkHidden("preserve-fds")
+	}
+
+}
+func exec(cmd *cobra.Command, args []string) error {
+	var nameOrId string
+	execOpts.Cmd = args
+	if !execOpts.Latest {
+		execOpts.Cmd = args[1:]
+		nameOrId = args[0]
+	}
+	// Validate given environment variables
+	execOpts.Envs = make(map[string]string)
+	for _, f := range envFile {
+		fileEnv, err := envLib.ParseFile(f)
+		if err != nil {
+			return err
+		}
+		execOpts.Envs = envLib.Join(execOpts.Envs, fileEnv)
+	}
+
+	cliEnv, err := envLib.ParseSlice(envInput)
+	if err != nil {
+		return errors.Wrap(err, "error parsing environment variables")
+	}
+
+	execOpts.Envs = envLib.Join(execOpts.Envs, cliEnv)
+	execOpts.Streams.OutputStream = os.Stdout
+	execOpts.Streams.ErrorStream = os.Stderr
+	if execOpts.Interactive {
+		execOpts.Streams.InputStream = bufio.NewReader(os.Stdin)
+		execOpts.Streams.AttachInput = true
+	}
+	execOpts.Streams.AttachOutput = true
+	execOpts.Streams.AttachError = true
+
+	exitCode, err := registry.ContainerEngine().ContainerExec(registry.GetContext(), nameOrId, execOpts)
+	registry.SetExitCode(exitCode)
+	return err
+}