summaryrefslogtreecommitdiff
path: root/cmd/podman/system/connection
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 /cmd/podman/system/connection
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 'cmd/podman/system/connection')
-rw-r--r--cmd/podman/system/connection/add.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go
index af13b970c..8b9ab6dbb 100644
--- a/cmd/podman/system/connection/add.go
+++ b/cmd/podman/system/connection/add.go
@@ -95,7 +95,7 @@ func add(cmd *cobra.Command, args []string) error {
uri.Host = net.JoinHostPort(uri.Hostname(), cmd.Flag("port").DefValue)
}
- if uri.Path == "" {
+ if uri.Path == "" || uri.Path == "/" {
if uri.Path, err = getUDS(cmd, uri); err != nil {
return errors.Wrapf(err, "failed to connect to %q", uri.String())
}