summaryrefslogtreecommitdiff
path: root/cmd/podman/registry
diff options
context:
space:
mode:
authorRomain Geissler <romain.geissler@amadeus.com>2022-02-19 13:57:20 +0000
committerRomain Geissler <romain.geissler@amadeus.com>2022-02-19 14:53:37 +0000
commit23a7f4e0deffb075d24b3e731246269d5a35b748 (patch)
tree05ac787436fe651dcedcb9ebfbf37b8aea6d7970 /cmd/podman/registry
parenta88ea2c68b1ef01077a53b1c568b85667dcbc1e2 (diff)
downloadpodman-23a7f4e0deffb075d24b3e731246269d5a35b748.tar.gz
podman-23a7f4e0deffb075d24b3e731246269d5a35b748.tar.bz2
podman-23a7f4e0deffb075d24b3e731246269d5a35b748.zip
Option --url and --connection should imply --remote.
Closes #13242 Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
Diffstat (limited to 'cmd/podman/registry')
-rw-r--r--cmd/podman/registry/remote.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/cmd/podman/registry/remote.go b/cmd/podman/registry/remote.go
index f05d8f7b4..181ef6b4a 100644
--- a/cmd/podman/registry/remote.go
+++ b/cmd/podman/registry/remote.go
@@ -30,6 +30,12 @@ func IsRemote() bool {
fs.Usage = func() {}
fs.SetInterspersed(false)
fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "")
+ connectionFlagName := "connection"
+ ignoredConnection := ""
+ fs.StringVarP(&ignoredConnection, connectionFlagName, "c", "", "")
+ urlFlagName := "url"
+ ignoredURL := ""
+ fs.StringVar(&ignoredURL, urlFlagName, "", "")
// The shell completion logic will call a command called "__complete" or "__completeNoDesc"
// This command will always be the second argument
@@ -39,6 +45,8 @@ func IsRemote() bool {
start = 2
}
_ = fs.Parse(os.Args[start:])
+ // --connection or --url implies --remote
+ remoteFromCLI.Value = remoteFromCLI.Value || fs.Changed(connectionFlagName) || fs.Changed(urlFlagName)
})
return podmanOptions.EngineMode == entities.TunnelMode || remoteFromCLI.Value
}