diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-08-18 06:47:19 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-08-20 12:42:28 -0400 |
| commit | bcd9b8125c4f042e596b2b9263f60825f32e15aa (patch) | |
| tree | 1ead36be5e1446599e4da2d264dbbe53b59e2acc /docs | |
| parent | 14379d6dbd6caaf331a86a994c9127a71918d6f4 (diff) | |
| download | podman-bcd9b8125c4f042e596b2b9263f60825f32e15aa.tar.gz podman-bcd9b8125c4f042e596b2b9263f60825f32e15aa.tar.bz2 podman-bcd9b8125c4f042e596b2b9263f60825f32e15aa.zip | |
Add support for --connection
* override --url and/or --identity fields from containers.conf
* --connection flag has higher precedence than ActiveService from
containers.conf. Which is set via podman system connection default
* Add newline to error message printed on stderr
* Added --connection to bash completion and documentation
* Updated bindings to query server in case of no path or /
Closes #jira-991
Fixes #7276
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Squashed commits to work around CI issue
<MH: Fixed rebase conflicts on v2.0>
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/source/markdown/podman-remote.1.md | 2 | ||||
| -rw-r--r-- | docs/source/markdown/podman.1.md | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docs/source/markdown/podman-remote.1.md b/docs/source/markdown/podman-remote.1.md index 0d7be1e5d..23ccaf0e6 100644 --- a/docs/source/markdown/podman-remote.1.md +++ b/docs/source/markdown/podman-remote.1.md @@ -23,7 +23,7 @@ Podman-remote provides a local client interacting with a Podman backend node thr ## GLOBAL OPTIONS -**--connection**=*name* +**--connection**=*name*, **-c** Remote connection name diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index 01a054ff4..7839ce8fb 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -31,6 +31,9 @@ Note: CGroup manager is not supported in rootless mode when using CGroups Versio **--cni-config-dir** Path of the configuration directory for CNI networks. (Default: `/etc/cni/net.d`) +**--connection**, **-c** +Connection to use for remote podman (Default connection is configured in `containers.conf`) + **--conmon** Path of the conmon binary (Default path is configured in `containers.conf`) |