opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 09:36:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13296 from Romain-Geissler-1A/url-and-connection-implies-remote

Browse Source 
Option --url and --connection should imply --remote.
This commit is contained in:
OpenShift Merge Robot
2022-02-21 15:21:37 -05:00
committed by GitHub
parent 62ff0409fa 23a7f4e0de
commit b3963e7081
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/podman/registry/remote.go
View File

@ -30,6 +30,12 @@ func IsRemote() bool {
fs.Usage = func() {} fs.Usage = func() {}
fs.SetInterspersed(false) fs.SetInterspersed(false)
fs.BoolVarP(&remoteFromCLI.Value, "remote", "r", remote, "") 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" // The shell completion logic will call a command called "__complete" or "__completeNoDesc"
// This command will always be the second argument // This command will always be the second argument
@ -39,6 +45,8 @@ func IsRemote() bool {
start = 2 start = 2
} }
_ = fs.Parse(os.Args[start:]) _ = 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 return podmanOptions.EngineMode == entities.TunnelMode || remoteFromCLI.Value
} }

2
docs/source/markdown/podman.1.md
View File

@ -42,6 +42,7 @@ and "$graphroot/networks" as rootless.
#### **--connection**, **-c** #### **--connection**, **-c**
Connection to use for remote podman, including Mac and Windows (excluding WSL2) machines, (Default connection is configured in `containers.conf`) 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. Remote connections use local containers.conf for default.
#### **--conmon** #### **--conmon**
@ -108,6 +109,7 @@ environment variable is set, the **--remote** option defaults to true.
#### **--url**=*value* #### **--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`). 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>]` - `CONTAINER_HOST` is of the format `<schema>://[<user[:<password>]@]<host>[:<port>][<path>]`

11
test/system/001-basic.bats
View File

@ -126,6 +126,17 @@ See 'podman version --help'" "podman version --remote"
if grep -- " --remote " <<<"$output"; then if grep -- " --remote " <<<"$output"; then
die "podman --help, with CONTAINER_CONNECTION set, is showing --remote" die "podman --help, with CONTAINER_CONNECTION set, is showing --remote"
fi 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 # Check that just calling "podman-remote" prints the usage message even