2 files changed, 59 insertions, 0 deletions
diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go
new file mode 100644
index 000000000..5e82e9dea
--- /dev/null
+++ b/cmd/podman/images/tree.go
@@ -0,0 +1,40 @@
+package images
+
+import (
+	"fmt"
+
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/spf13/cobra"
+)
+
+var (
+	treeDescription = "Prints layer hierarchy of an image in a tree format"
+	treeCmd         = &cobra.Command{
+		Use:     "tree [flags] IMAGE",
+		Args:    cobra.ExactArgs(1),
+		Short:   treeDescription,
+		Long:    treeDescription,
+		RunE:    tree,
+		Example: "podman image tree alpine:latest",
+	}
+	treeOpts entities.ImageTreeOptions
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: treeCmd,
+		Parent:  imageCmd,
+	})
+	treeCmd.Flags().BoolVar(&treeOpts.WhatRequires, "whatrequires", false, "Show all child images and layers of the specified image")
+}
+
+func tree(_ *cobra.Command, args []string) error {
+	results, err := registry.ImageEngine().Tree(registry.Context(), args[0], treeOpts)
+	if err != nil {
+		return err
+	}
+	fmt.Println(results.Tree)
+	return nil
+}
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 6522a45f8..e09107b53 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -2,8 +2,10 @@ package system
 
 import (
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
+	"syscall"
 	"time"
 
 	"github.com/containers/libpod/cmd/podman/registry"
@@ -59,6 +61,23 @@ func service(cmd *cobra.Command, args []string) error {
 	}
 	logrus.Infof("using API endpoint: '%s'", apiURI)
 
+	// Clean up any old existing unix domain socket
+	if len(apiURI) > 0 {
+		uri, err := url.Parse(apiURI)
+		if err != nil {
+			return err
+		}
+
+		// socket activation uses a unix:// socket in the shipped unit files but apiURI is coded as "" at this layer.
+		if "unix" == uri.Scheme && !registry.IsRemote() {
+			if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) {
+				return err
+			}
+			mask := syscall.Umask(0177)
+			defer syscall.Umask(mask)
+		}
+	}
+
 	opts := entities.ServiceOptions{
 		URI:     apiURI,
 		Timeout: time.Duration(srvArgs.Timeout) * time.Second,