summaryrefslogtreecommitdiff
path: root/docs/source
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-08-18 06:47:19 -0400
committerJhon Honce <jhonce@redhat.com>2020-08-19 08:37:44 -0700
commiteb9e8fc558baf314b6f244af748e5a3e87356a57 (patch)
treeed93b65552fe6d9a52608e20e59b629d37d0e660 /docs/source
parentdd4e0da4241ac0b6deac3f5e07ea4eeb5819379e (diff)
downloadpodman-eb9e8fc558baf314b6f244af748e5a3e87356a57.tar.gz
podman-eb9e8fc558baf314b6f244af748e5a3e87356a57.tar.bz2
podman-eb9e8fc558baf314b6f244af748e5a3e87356a57.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
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/markdown/podman-remote.1.md2
-rw-r--r--docs/source/markdown/podman.1.md3
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 16439c167..c53da6b5f 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`)