diff options
author | Brent Baude <bbaude@redhat.com> | 2020-03-19 16:50:15 -0500 |
---|---|---|
committer | Brent Baude <bbaude@redhat.com> | 2020-03-20 12:54:45 -0500 |
commit | 87293028e61d0c88c258ed9f4a82c4be7f0bc896 (patch) | |
tree | cd3c6f35eed940e41afed71e7f60f7a8abac1612 /pkg/domain/infra/runtime_tunnel.go | |
parent | ccc30c606e843d5c98e2c62a3b393a61e60976b2 (diff) | |
download | podman-87293028e61d0c88c258ed9f4a82c4be7f0bc896.tar.gz podman-87293028e61d0c88c258ed9f4a82c4be7f0bc896.tar.bz2 podman-87293028e61d0c88c258ed9f4a82c4be7f0bc896.zip |
podmanv2 container exists|wait
enable container exists and wait for podmanv2
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/domain/infra/runtime_tunnel.go')
-rw-r--r-- | pkg/domain/infra/runtime_tunnel.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkg/domain/infra/runtime_tunnel.go b/pkg/domain/infra/runtime_tunnel.go index 8a606deaf..5816ef0c0 100644 --- a/pkg/domain/infra/runtime_tunnel.go +++ b/pkg/domain/infra/runtime_tunnel.go @@ -11,25 +11,25 @@ import ( "github.com/containers/libpod/pkg/domain/infra/tunnel" ) -func NewContainerEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ContainerEngine, error) { - switch mode { +func NewContainerEngine(opts entities.EngineOptions) (entities.ContainerEngine, error) { + switch opts.EngineMode { case entities.ABIMode: return nil, fmt.Errorf("direct runtime not supported") case entities.TunnelMode: - ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...) + ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...) return &tunnel.ContainerEngine{ClientCxt: ctx}, err } - return nil, fmt.Errorf("runtime mode '%v' is not supported", mode) + return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode) } // NewImageEngine factory provides a libpod runtime for image-related operations -func NewImageEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ImageEngine, error) { - switch mode { +func NewImageEngine(opts entities.EngineOptions) (entities.ImageEngine, error) { + switch opts.EngineMode { case entities.ABIMode: return nil, fmt.Errorf("direct image runtime not supported") case entities.TunnelMode: - ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...) + ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...) return &tunnel.ImageEngine{ClientCxt: ctx}, err } - return nil, fmt.Errorf("runtime mode '%v' is not supported", mode) + return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode) } |