Merge pull request #6143 from rhatdan/remote

default to tunnel without ABISupport tag

1 files changed, 18 insertions, 2 deletions

diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go
index 69e2babfc..71ee2bed0 100644
--- a/cmd/podman/registry/registry.go
+++ b/cmd/podman/registry/registry.go
@@ -2,14 +2,18 @@ package registry
 
 import (
 	"context"
+	"path/filepath"
 
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/domain/infra"
+	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/pkg/util"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
-// DefaultAPIAddress is the default address of the REST socket
-const DefaultAPIAddress = "unix:/run/podman/podman.sock"
+// DefaultRootAPIAddress is the default address of the REST socket
+const DefaultRootAPIAddress = "unix:/run/podman/podman.sock"
 
 // DefaultVarlinkAddress is the default address of the varlink socket
 const DefaultVarlinkAddress = "unix:/run/podman/io.podman"
@@ -98,3 +102,15 @@ func GetContextWithOptions() context.Context {
 func GetContext() context.Context {
 	return Context()
 }
+
+func DefaultAPIAddress() string {
+	if rootless.IsRootless() {
+		xdg, err := util.GetRuntimeDir()
+		if err != nil {
+			logrus.Warnf("Failed to get rootless runtime dir for DefaultAPIAddress: %s", err)
+			return DefaultRootAPIAddress
+		}
+		return "unix:" + filepath.Join(xdg, "podman", "podman.sock")
+	}
+	return DefaultRootAPIAddress
+}