diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-02-19 17:38:43 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-02-20 14:18:45 -0700 |
| commit | 0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb (patch) | |
| tree | fc0679e6470c4a2a4407002ee9c90766a3a9983e /pkg/bindings/network | |
| parent | 83a9b318e150e96ba381f2fdf0db9d979e0740f0 (diff) | |
| download | podman-0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb.tar.gz podman-0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb.tar.bz2 podman-0f0b4fd3c2fc448bdc46169dbb9656c32bb53ebb.zip | |
Add support for ssh:// and unix:// podman clients
* Make context keys package safe
* Add support for PODMAN_HOST and PODMAN_SSHKEY
* Add slight increasing delay when client connections fail
* Remove usages of path.Join(), added JoinURL(). '/' is not OS
dependent.
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/bindings/network')
| -rw-r--r-- | pkg/bindings/network/network.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/bindings/network/network.go b/pkg/bindings/network/network.go index 97bbb8c42..c95b22953 100644 --- a/pkg/bindings/network/network.go +++ b/pkg/bindings/network/network.go @@ -10,7 +10,7 @@ import ( func Create() {} func Inspect(ctx context.Context, nameOrID string) (map[string]interface{}, error) { - conn, err := bindings.GetConnectionFromContext(ctx) + conn, err := bindings.GetClient(ctx) if err != nil { return nil, err } @@ -23,7 +23,7 @@ func Inspect(ctx context.Context, nameOrID string) (map[string]interface{}, erro } func Remove(ctx context.Context, nameOrID string) error { - conn, err := bindings.GetConnectionFromContext(ctx) + conn, err := bindings.GetClient(ctx) if err != nil { return err } @@ -38,7 +38,7 @@ func List(ctx context.Context) ([]*libcni.NetworkConfigList, error) { var ( netList []*libcni.NetworkConfigList ) - conn, err := bindings.GetConnectionFromContext(ctx) + conn, err := bindings.GetClient(ctx) if err != nil { return nil, err } |