diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-24 21:48:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-24 21:48:37 +0100 |
| commit | 0c084d9719772a9b68d5eb67114cf5bf001958b2 (patch) | |
| tree | f6ed82f9c435c30b44d5c820502607ba60e89282 /pkg/domain/infra/runtime_proxy.go | |
| parent | c29a4c69044c02eee564fc72c64144b2a76d1d73 (diff) | |
| parent | 77a2af8817284d134ea1f30f0b06291a5b05c5a0 (diff) | |
| download | podman-0c084d9719772a9b68d5eb67114cf5bf001958b2.tar.gz podman-0c084d9719772a9b68d5eb67114cf5bf001958b2.tar.bz2 podman-0c084d9719772a9b68d5eb67114cf5bf001958b2.zip | |
Merge pull request #5592 from jwhonce/wip/globalflags
Combine GlobalFlags and EngineFlags into EngineOptions
Diffstat (limited to 'pkg/domain/infra/runtime_proxy.go')
| -rw-r--r-- | pkg/domain/infra/runtime_proxy.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go index 4095ae6e2..2e38c74b9 100644 --- a/pkg/domain/infra/runtime_proxy.go +++ b/pkg/domain/infra/runtime_proxy.go @@ -12,7 +12,7 @@ import ( // ContainerEngine Proxy will be EOL'ed after podmanV2 is separated from libpod repo -func NewLibpodRuntime(flags *flag.FlagSet, opts entities.EngineFlags) (entities.ContainerEngine, error) { +func NewLibpodRuntime(flags *flag.FlagSet, opts entities.EngineOptions) (entities.ContainerEngine, error) { r, err := GetRuntime(context.Background(), flags, opts) if err != nil { return nil, err |