diff options
| author | Romain Geissler <romain.geissler@amadeus.com> | 2022-02-19 13:57:20 +0000 |
|---|---|---|
| committer | Romain Geissler <romain.geissler@amadeus.com> | 2022-02-26 10:27:34 +0000 |
| commit | ca980c2e024bd33f4be3a33bb1dbb22c86bfe072 (patch) | |
| tree | 0df5b67905dbb2cfc440fb8ae880b70687cba24c | |
| parent | 49d511b6ee88ceff70cc6786c467bed39da35a61 (diff) | |
| download | podman-ca980c2e024bd33f4be3a33bb1dbb22c86bfe072.tar.gz podman-ca980c2e024bd33f4be3a33bb1dbb22c86bfe072.tar.bz2 podman-ca980c2e024bd33f4be3a33bb1dbb22c86bfe072.zip | |
Option --url and --connection should imply --remote.
Closes #13242
Signed-off-by: Romain Geissler <romain.geissler@amadeus.com>
| -rw-r--r-- | cmd/podman/registry/remote.go | 8 | ||||
| -rw-r--r-- | docs/source/markdown/podman.1.md | 2 | ||||
| -rw-r--r-- | test/system/001-basic.bats | 11 |
3 files changed, 21 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 } diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index b318001e4..4d3e92dd2 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -42,6 +42,7 @@ and "$graphroot/networks" as rootless. #### **--connection**, **-c** Connection to use for remote podman, including Mac and Windows (excluding WSL2) machines, (Default connection is configured in `containers.conf`) +Setting this option will switch the **--remote** option to true. Remote connections use local containers.conf for default. #### **--conmon** @@ -108,6 +109,7 @@ environment variable is set, the **--remote** option defaults to true. #### **--url**=*value* URL to access Podman service (default from `containers.conf`, rootless `unix://run/user/$UID/podman/podman.sock` or as root `unix://run/podman/podman.sock`). +Setting this option will switch the **--remote** option to true. - `CONTAINER_HOST` is of the format `<schema>://[<user[:<password>]@]<host>[:<port>][<path>]` diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats index 748377e4b..582efa058 100644 --- a/test/system/001-basic.bats +++ b/test/system/001-basic.bats @@ -126,6 +126,17 @@ See 'podman version --help'" "podman version --remote" if grep -- " --remote " <<<"$output"; then die "podman --help, with CONTAINER_CONNECTION set, is showing --remote" fi + + # When it detects --url or --connection, --remote is not an option + run_podman --url foobar --help + if grep -- " --remote " <<<"$output"; then + die "podman --help, with --url set, is showing --remote" + fi + + run_podman --connection foobar --help + if grep -- " --remote " <<<"$output"; then + die "podman --help, with --connection set, is showing --remote" + fi } # Check that just calling "podman-remote" prints the usage message even |