diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-29 11:31:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 11:31:39 -0400 |
| commit | 59e6192eb6027ebf520a4b5ea4137d0a85f23c02 (patch) | |
| tree | d4641b6c3f7d6a1c7d4fa64df3994578ca0630be /cmd/podman/registry/config.go | |
| parent | 6ac009d5304127f6758be157c7302646e5a481e5 (diff) | |
| parent | 6fb5f01c736d5cbf11bc7eaad09f6f0c7fd1d0d4 (diff) | |
| download | podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.gz podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.tar.bz2 podman-59e6192eb6027ebf520a4b5ea4137d0a85f23c02.zip | |
Merge pull request #6716 from jwhonce/issues/6598
Fixes --remote flag issues
Diffstat (limited to 'cmd/podman/registry/config.go')
| -rw-r--r-- | cmd/podman/registry/config.go | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index a67568d73..85a63402b 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -5,7 +5,6 @@ import ( "os" "path/filepath" "runtime" - "strings" "sync" "github.com/containers/common/pkg/config" @@ -45,7 +44,7 @@ func newPodmanConfig() { case "linux": // Some linux clients might only be compiled without ABI // support (e.g., podman-remote). - if abiSupport { + if abiSupport && !remoteOverride { mode = entities.ABIMode } else { mode = entities.TunnelMode @@ -55,19 +54,6 @@ func newPodmanConfig() { os.Exit(1) } - // 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 - } - } - } - cfg, err := config.NewConfig("") if err != nil { fmt.Fprint(os.Stderr, "Failed to obtain podman configuration: "+err.Error()) |