7 files changed, 129 insertions, 22 deletions

diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index 102186854..c15ce8829 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -659,6 +659,11 @@ type SystemPruneValues struct {
 	Volume bool
 }
 
+type SystemResetValues struct {
+	PodmanCommand
+	Force bool
+}
+
 type SystemRenumberValues struct {
 	PodmanCommand
 }
diff --git a/cmd/podman/main_local.go b/cmd/podman/main_local.go
index 968d7331a..bc46e4652 100644
--- a/cmd/podman/main_local.go
+++ b/cmd/podman/main_local.go
@@ -159,7 +159,7 @@ func setupRootless(cmd *cobra.Command, args []string) error {
 		Remote:      remoteclient,
 	}
 
-	runtime, err := libpodruntime.GetRuntime(getContext(), &podmanCmd)
+	runtime, err := libpodruntime.GetRuntimeNoStore(getContext(), &podmanCmd)
 	if err != nil {
 		return errors.Wrapf(err, "could not get runtime")
 	}
diff --git a/cmd/podman/reset.go b/cmd/podman/reset.go
new file mode 100644
index 000000000..9d16dc978
--- /dev/null
+++ b/cmd/podman/reset.go
@@ -0,0 +1,71 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/containers/libpod/cmd/podman/cliconfig"
+	"github.com/containers/libpod/pkg/adapter"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	systemResetCommand     cliconfig.SystemResetValues
+	systemResetDescription = `Reset podman storage back to default state"
+
+  All containers will be stopped and removed, and all images, volumes and container content will be removed.
+`
+	_systemResetCommand = &cobra.Command{
+		Use:   "reset",
+		Args:  noSubArgs,
+		Short: "Reset podman storage",
+		Long:  systemResetDescription,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			systemResetCommand.InputArgs = args
+			systemResetCommand.GlobalFlags = MainGlobalOpts
+			systemResetCommand.Remote = remoteclient
+			return systemResetCmd(&systemResetCommand)
+		},
+	}
+)
+
+func init() {
+	systemResetCommand.Command = _systemResetCommand
+	flags := systemResetCommand.Flags()
+	flags.BoolVarP(&systemResetCommand.Force, "force", "f", false, "Do not prompt for confirmation")
+
+	systemResetCommand.SetHelpTemplate(HelpTemplate())
+	systemResetCommand.SetUsageTemplate(UsageTemplate())
+}
+
+func systemResetCmd(c *cliconfig.SystemResetValues) error {
+	// Prompt for confirmation if --force is not set
+	if !c.Force {
+		reader := bufio.NewReader(os.Stdin)
+		fmt.Print(`
+WARNING! This will remove:
+        - all containers
+        - all pods
+        - all images
+        - all build cache
+Are you sure you want to continue? [y/N] `)
+		ans, err := reader.ReadString('\n')
+		if err != nil {
+			return errors.Wrapf(err, "error reading input")
+		}
+		if strings.ToLower(ans)[0] != 'y' {
+			return nil
+		}
+	}
+
+	runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand)
+	if err != nil {
+		return errors.Wrapf(err, "error creating libpod runtime")
+	}
+	// No shutdown, since storage will be destroyed when command completes
+
+	return runtime.Reset()
+}
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go
index 364fede76..4f2002992 100644
--- a/cmd/podman/shared/container.go
+++ b/cmd/podman/shared/container.go
@@ -196,6 +196,8 @@ func NewBatchContainer(ctr *libpod.Container, opts PsOptions) (PsContainerOutput
 		status = "Paused"
 	case define.ContainerStateCreated.String(), define.ContainerStateConfigured.String():
 		status = "Created"
+	case define.ContainerStateRemoving.String():
+		status = "Removing"
 	default:
 		status = "Error"
 	}
diff --git a/cmd/podman/system.go b/cmd/podman/system.go
index 80080bf44..921d0c037 100644
--- a/cmd/podman/system.go
+++ b/cmd/podman/system.go
@@ -19,6 +19,7 @@ var (
 )
 
 var systemCommands = []*cobra.Command{
+	_systemResetCommand,
 	_infoCommand,
 	_pruneSystemCommand,
 }
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index e76b9627e..a3fd27ed6 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -536,6 +536,10 @@ method GetVersion() -> (
     remote_api_version: int
 )
 
+# Reset resets Podman back to its initial state.
+# Removes all Pods, Containers, Images and Volumes
+method Reset() -> ()
+
 # GetInfo returns a [PodmanInfo](#PodmanInfo) struct that describes podman and its host such as storage stats,
 # build information of Podman, and system-wide registries.
 method GetInfo() -> (info: PodmanInfo)
diff --git a/cmd/podman/version.go b/cmd/podman/version.go
index 314b2e266..5907241ff 100644
--- a/cmd/podman/version.go
+++ b/cmd/podman/version.go
@@ -37,13 +37,40 @@ func init() {
 	flags := versionCommand.Flags()
 	flags.StringVarP(&versionCommand.Format, "format", "f", "", "Change the output format to JSON or a Go template")
 }
+func getRemoteVersion(c *cliconfig.VersionValues) (version define.Version, err error) {
+	runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand)
+	if err != nil {
+		return version, errors.Wrapf(err, "could not get runtime")
+	}
+	defer runtime.DeferredShutdown(false)
+
+	return runtime.GetVersion()
+}
+
+type versionStruct struct {
+	Client define.Version
+	Server define.Version
+}
 
 // versionCmd gets and prints version info for version command
 func versionCmd(c *cliconfig.VersionValues) error {
-	clientVersion, err := define.GetVersion()
+
+	var (
+		v   versionStruct
+		err error
+	)
+	v.Client, err = define.GetVersion()
 	if err != nil {
 		return errors.Wrapf(err, "unable to determine version")
 	}
+	if remote {
+		v.Server, err = getRemoteVersion(c)
+		if err != nil {
+			return err
+		}
+	} else {
+		v.Server = v.Client
+	}
 
 	versionOutputFormat := c.Format
 	if versionOutputFormat != "" {
@@ -53,11 +80,20 @@ func versionCmd(c *cliconfig.VersionValues) error {
 		var out formats.Writer
 		switch versionOutputFormat {
 		case formats.JSONString:
-			out = formats.JSONStruct{Output: clientVersion}
+			out = formats.JSONStruct{Output: v}
+			return out.Out()
 		default:
-			out = formats.StdoutTemplate{Output: clientVersion, Template: versionOutputFormat}
+			out = formats.StdoutTemplate{Output: v, Template: versionOutputFormat}
+			err := out.Out()
+			if err != nil {
+				// On Failure, assume user is using older version of podman version --format and check client
+				out = formats.StdoutTemplate{Output: v.Client, Template: versionOutputFormat}
+				if err1 := out.Out(); err1 != nil {
+					return err
+				}
+			}
 		}
-		return out.Out()
+		return nil
 	}
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	defer w.Flush()
@@ -66,25 +102,13 @@ func versionCmd(c *cliconfig.VersionValues) error {
 		if _, err := fmt.Fprintf(w, "Client:\n"); err != nil {
 			return err
 		}
-	}
-	formatVersion(w, clientVersion)
-
-	if remote {
-		if _, err := fmt.Fprintf(w, "\nService:\n"); err != nil {
-			return err
-		}
-
-		runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand)
-		if err != nil {
-			return errors.Wrapf(err, "could not get runtime")
-		}
-		defer runtime.DeferredShutdown(false)
-
-		serviceVersion, err := runtime.GetVersion()
-		if err != nil {
+		formatVersion(w, v.Client)
+		if _, err := fmt.Fprintf(w, "\nServer:\n"); err != nil {
 			return err
 		}
-		formatVersion(w, serviceVersion)
+		formatVersion(w, v.Server)
+	} else {
+		formatVersion(w, v.Client)
 	}
 	return nil
 }