1 files changed, 18 insertions, 1 deletions
diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go
index 95870750e..ed1a874d6 100644
--- a/cmd/podman/registry/remote.go
+++ b/cmd/podman/registry/remote.go
@@ -1,9 +1,26 @@
 package registry
 
 import (
+	"os"
+	"sync"
+
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/spf13/cobra"
+)
+
+var (
+	// Was --remote given on command line
+	remoteOverride bool
+	remoteSync     sync.Once
 )
 
+// IsRemote returns true if podman was built to run remote
+// Use in init() functions as a initialization check
 func IsRemote() bool {
-	return podmanOptions.EngineMode == entities.TunnelMode
+	remoteSync.Do(func() {
+		remote := &cobra.Command{}
+		remote.Flags().BoolVarP(&remoteOverride, "remote", "r", false, "")
+		_ = remote.ParseFlags(os.Args)
+	})
+	return podmanOptions.EngineMode == entities.TunnelMode || remoteOverride
 }