Merge pull request #10080 from rhatdan/remote

podman-remote should show podman.sock info

1 files changed, 13 insertions, 4 deletions

diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go
index 9e8a9f9b4..364663323 100644
--- a/cmd/podman/system/service_abi.go
+++ b/cmd/podman/system/service_abi.go
@@ -6,11 +6,13 @@ import (
 	"context"
 	"net"
 	"os"
+	"path/filepath"
 	"strings"
 
 	api "github.com/containers/podman/v3/pkg/api/server"
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/containers/podman/v3/pkg/domain/infra"
+	"github.com/containers/podman/v3/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
@@ -24,6 +26,17 @@ func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entiti
 	)
 
 	if opts.URI != "" {
+		fields := strings.Split(opts.URI, ":")
+		if len(fields) == 1 {
+			return errors.Errorf("%s is an invalid socket destination", opts.URI)
+		}
+		path := opts.URI
+		if fields[0] == "unix" {
+			if path, err = filepath.Abs(fields[1]); err != nil {
+				return err
+			}
+		}
+		util.SetSocketPath(path)
 		if os.Getenv("LISTEN_FDS") != "" {
 			// If it is activated by systemd, use the first LISTEN_FD (3)
 			// instead of opening the socket file.
@@ -34,10 +47,6 @@ func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entiti
 			}
 			listener = &l
 		} else {
-			fields := strings.Split(opts.URI, ":")
-			if len(fields) == 1 {
-				return errors.Errorf("%s is an invalid socket destination", opts.URI)
-			}
 			network := fields[0]
 			address := strings.Join(fields[1:], ":")
 			l, err := net.Listen(network, address)