3 files changed, 63 insertions, 20 deletions

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index dfb7415a9..3aeba6fb0 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -503,6 +503,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil
 		ReportWriter:            reporter,
 		Runtime:                 containerConfig.RuntimePath,
 		RuntimeArgs:             runtimeFlags,
+		RusageLogFile:           flags.RusageLogFile,
 		SignBy:                  flags.SignBy,
 		SignaturePolicyPath:     flags.SignaturePolicy,
 		Squash:                  flags.Squash,
diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go
index ecfeb6608..912193d0b 100644
--- a/cmd/podman/system/connection/add.go
+++ b/cmd/podman/system/connection/add.go
@@ -23,22 +23,24 @@ import (
 	"golang.org/x/crypto/ssh/agent"
 )
 
-const schemaPattern = "^[A-Za-z][A-Za-z0-9+.-]*:"
-
 var (
 	addCmd = &cobra.Command{
 		Use:   "add [options] NAME DESTINATION",
 		Args:  cobra.ExactArgs(2),
 		Short: "Record destination for the Podman service",
 		Long: `Add destination to podman configuration.
-  "destination" is of the form [user@]hostname or
-  an URI of the form ssh://[user@]hostname[:port]
+  "destination" is one of the form:
+    [user@]hostname (will default to ssh)
+    ssh://[user@]hostname[:port][/path] (will obtain socket path from service, if not given.)
+    tcp://hostname:port (not secured)
+    unix://path (absolute path required)
 `,
 		RunE:              add,
 		ValidArgsFunction: completion.AutocompleteNone,
 		Example: `podman system connection add laptop server.fubar.com
   podman system connection add --identity ~/.ssh/dev_rsa testing ssh://root@server.fubar.com:2222
   podman system connection add --identity ~/.ssh/dev_rsa --port 22 production root@server.fubar.com
+  podman system connection add debug tcp://localhost:8080
   `,
 	}
 
@@ -74,9 +76,9 @@ func init() {
 }
 
 func add(cmd *cobra.Command, args []string) error {
-	// Default to ssh: schema if none given
+	// Default to ssh schema if none given
 	dest := args[1]
-	if match, err := regexp.Match(schemaPattern, []byte(dest)); err != nil {
+	if match, err := regexp.Match("^[A-Za-z][A-Za-z0-9+.-]*://", []byte(dest)); err != nil {
 		return errors.Wrapf(err, "invalid destination")
 	} else if !match {
 		dest = "ssh://" + dest
@@ -87,28 +89,63 @@ func add(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if uri.User.Username() == "" {
-		if uri.User, err = getUserInfo(uri); err != nil {
-			return err
-		}
-	}
-
 	if cmd.Flags().Changed("socket-path") {
 		uri.Path = cmd.Flag("socket-path").Value.String()
 	}
 
-	if cmd.Flags().Changed("port") {
-		uri.Host = net.JoinHostPort(uri.Hostname(), cmd.Flag("port").Value.String())
-	}
+	switch uri.Scheme {
+	case "ssh":
+		if uri.User.Username() == "" {
+			if uri.User, err = getUserInfo(uri); err != nil {
+				return err
+			}
+		}
 
-	if uri.Port() == "" {
-		uri.Host = net.JoinHostPort(uri.Hostname(), cmd.Flag("port").DefValue)
-	}
+		if cmd.Flags().Changed("port") {
+			uri.Host = net.JoinHostPort(uri.Hostname(), cmd.Flag("port").Value.String())
+		}
 
-	if uri.Path == "" || uri.Path == "/" {
-		if uri.Path, err = getUDS(cmd, uri); err != nil {
+		if uri.Port() == "" {
+			uri.Host = net.JoinHostPort(uri.Hostname(), cmd.Flag("port").DefValue)
+		}
+
+		if uri.Path == "" || uri.Path == "/" {
+			if uri.Path, err = getUDS(cmd, uri); err != nil {
+				return err
+			}
+		}
+	case "unix":
+		if cmd.Flags().Changed("identity") {
+			return errors.New("--identity option not supported for unix scheme")
+		}
+
+		if cmd.Flags().Changed("socket-path") {
+			uri.Path = cmd.Flag("socket-path").Value.String()
+		}
+
+		info, err := os.Stat(uri.Path)
+		switch {
+		case errors.Is(err, os.ErrNotExist):
+			logrus.Warnf("%q does not exists", uri.Path)
+		case errors.Is(err, os.ErrPermission):
+			logrus.Warnf("You do not have permission to read %q", uri.Path)
+		case err != nil:
 			return err
+		case info.Mode()&os.ModeSocket == 0:
+			return fmt.Errorf("%q exists and is not a unix domain socket", uri.Path)
+		}
+	case "tcp":
+		if cmd.Flags().Changed("socket-path") {
+			return errors.New("--socket-path option not supported for tcp scheme")
+		}
+		if cmd.Flags().Changed("identity") {
+			return errors.New("--identity option not supported for tcp scheme")
+		}
+		if uri.Port() == "" {
+			return errors.New("tcp scheme requires a port either via --port or in destination URL")
 		}
+	default:
+		logrus.Warnf("%q unknown scheme, no validation provided", uri.Scheme)
 	}
 
 	cfg, err := config.ReadCustomConfig()
diff --git a/cmd/podman/system/connection/list.go b/cmd/podman/system/connection/list.go
index 2f74215c1..de85ce3fa 100644
--- a/cmd/podman/system/connection/list.go
+++ b/cmd/podman/system/connection/list.go
@@ -3,6 +3,7 @@ package connection
 import (
 	"fmt"
 	"os"
+	"sort"
 
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/config"
@@ -77,6 +78,10 @@ func list(cmd *cobra.Command, _ []string) error {
 		rows = append(rows, r)
 	}
 
+	sort.Slice(rows, func(i, j int) bool {
+		return rows[i].Name < rows[j].Name
+	})
+
 	format := "{{.Name}}\t{{.Identity}}\t{{.URI}}\n"
 	switch {
 	case report.IsJSON(cmd.Flag("format").Value.String()):