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 /cmd/podman/system/connection | |
| 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 'cmd/podman/system/connection')
| -rw-r--r-- | cmd/podman/system/connection/add.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index 7522eb190..77a2edf8a 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()) } |