diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-20 22:22:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 22:22:20 +0100 |
| commit | 7a095af92a6a39845b1c362222b23632f3e17001 (patch) | |
| tree | 52a8692894690a8f09e025f90d6d2b5045259e4f /pkg/domain/entities/engine.go | |
| parent | 6df1d2043bd3cd2252ea3d737cf542e332106074 (diff) | |
| parent | c81e065149da73ae904aa19ee46a23d1ab8ce55c (diff) | |
| download | podman-7a095af92a6a39845b1c362222b23632f3e17001.tar.gz podman-7a095af92a6a39845b1c362222b23632f3e17001.tar.bz2 podman-7a095af92a6a39845b1c362222b23632f3e17001.zip | |
Merge pull request #5571 from baude/v2exists
podmanv2 container exists|wait
Diffstat (limited to 'pkg/domain/entities/engine.go')
| -rw-r--r-- | pkg/domain/entities/engine.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go index a1096f1f1..08ef1df92 100644 --- a/pkg/domain/entities/engine.go +++ b/pkg/domain/entities/engine.go @@ -1,7 +1,6 @@ package entities import ( - "net/url" "os/user" "path/filepath" @@ -20,11 +19,13 @@ func (m EngineMode) String() string { return string(m) } +// FIXME: merge EngineOptions and EngineFlags type EngineOptions struct { - Uri *url.URL + Uri string Identities []string - FlagSet pflag.FlagSet + FlagSet *pflag.FlagSet Flags EngineFlags + EngineMode EngineMode } type EngineFlags struct { @@ -58,8 +59,6 @@ type EngineFlags struct { Port int IdentityFile string IgnoreHosts bool - - EngineMode EngineMode } func NewEngineOptions() (EngineFlags, error) { |