4 files changed, 51 insertions, 12 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go
index fc6eb538e..49d5bca74 100644
--- a/cmd/podman/registry/config.go
+++ b/cmd/podman/registry/config.go
@@ -22,6 +22,7 @@ const (
 var (
 	podmanOptions entities.PodmanConfig
 	podmanSync    sync.Once
+	abiSupport    = false
 )
 
 // PodmanConfig returns an entities.PodmanConfig built up from
@@ -39,23 +40,31 @@ func newPodmanConfig() {
 
 	var mode entities.EngineMode
 	switch runtime.GOOS {
-	case "darwin":
-		fallthrough
-	case "windows":
+	case "darwin", "windows":
 		mode = entities.TunnelMode
 	case "linux":
-		mode = entities.ABIMode
+		// Some linux clients might only be compiled without ABI
+		// support (e.g., podman-remote).
+		if abiSupport {
+			mode = entities.ABIMode
+		} else {
+			mode = entities.TunnelMode
+		}
 	default:
 		fmt.Fprintf(os.Stderr, "%s is not a supported OS", runtime.GOOS)
 		os.Exit(1)
 	}
 
-	// cobra.Execute() may not be called yet, so we peek at os.Args.
-	for _, v := range os.Args {
-		// Prefix checking works because of how default EngineMode's
-		// have been defined.
-		if strings.HasPrefix(v, "--remote") {
-			mode = entities.TunnelMode
+	// Check if need to fallback to the tunnel mode if --remote is used.
+	if abiSupport && mode == entities.ABIMode {
+		// cobra.Execute() may not be called yet, so we peek at os.Args.
+		for _, v := range os.Args {
+			// Prefix checking works because of how default EngineMode's
+			// have been defined.
+			if strings.HasPrefix(v, "--remote") {
+				mode = entities.TunnelMode
+				break
+			}
 		}
 	}
 
diff --git a/cmd/podman/registry/config_abi.go b/cmd/podman/registry/config_abi.go
new file mode 100644
index 000000000..55430e1bf
--- /dev/null
+++ b/cmd/podman/registry/config_abi.go
@@ -0,0 +1,7 @@
+// +build ABISupport
+
+package registry
+
+func init() {
+	abiSupport = true
+}
diff --git a/cmd/podman/registry/config_tunnel.go b/cmd/podman/registry/config_tunnel.go
new file mode 100644
index 000000000..29e744dac
--- /dev/null
+++ b/cmd/podman/registry/config_tunnel.go
@@ -0,0 +1,7 @@
+// +build !ABISupport
+
+package registry
+
+func init() {
+	abiSupport = false
+}
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
+}