diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-20 13:17:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-20 13:17:31 -0500 |
| commit | 00a12a0b83e8ca6747e19f233a3e926886358c4a (patch) | |
| tree | 8f49058fe3bc637f00e67871f3a767b1642b6ef2 /cmd | |
| parent | 76ba0df6020f477a17a19b5ea69d46edaf085e28 (diff) | |
| parent | 1f85244abe7d4e930b3922c306cabf2e2ca1cddb (diff) | |
| download | podman-00a12a0b83e8ca6747e19f233a3e926886358c4a.tar.gz podman-00a12a0b83e8ca6747e19f233a3e926886358c4a.tar.bz2 podman-00a12a0b83e8ca6747e19f233a3e926886358c4a.zip | |
Merge pull request #12871 from jwhonce/issues/12866
Engine.Remote from containers.conf
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/registry/config.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index f5822d33e..15bb7aee0 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -52,6 +52,12 @@ func newPodmanConfig() { os.Exit(1) } + cfg, err := config.NewConfig("") + if err != nil { + fmt.Fprint(os.Stderr, "Failed to obtain podman configuration: "+err.Error()) + os.Exit(1) + } + var mode entities.EngineMode switch runtime.GOOS { case "darwin", "windows": @@ -64,16 +70,15 @@ func newPodmanConfig() { } else { mode = entities.TunnelMode } - default: fmt.Fprintf(os.Stderr, "%s is not a supported OS", runtime.GOOS) os.Exit(1) } - cfg, err := config.NewConfig("") - if err != nil { - fmt.Fprint(os.Stderr, "Failed to obtain podman configuration: "+err.Error()) - os.Exit(1) + // If EngineMode==Tunnel has not been set on the command line or environment + // but has been set in containers.conf... + if mode == entities.ABIMode && cfg.Engine.Remote { + mode = entities.TunnelMode } cfg.Network.NetworkConfigDir = cfg.Network.CNIPluginDirs[0] |