4 files changed, 81 insertions, 0 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index a34afa827..df7ea6c33 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -658,6 +658,11 @@ type SystemPruneValues struct {
 	Volume bool
 }
 
+type SystemResetValues struct {
+	PodmanCommand
+	Force bool
+}
+
 type SystemRenumberValues struct {
 	PodmanCommand
 }
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/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)