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/entities | |
| 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/entities')
| -rw-r--r-- | pkg/domain/entities/engine.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go index 08ef1df92..8553f5326 100644 --- a/pkg/domain/entities/engine.go +++ b/pkg/domain/entities/engine.go @@ -19,16 +19,12 @@ func (m EngineMode) String() string { return string(m) } -// FIXME: merge EngineOptions and EngineFlags type EngineOptions struct { Uri string Identities []string FlagSet *pflag.FlagSet - Flags EngineFlags EngineMode EngineMode -} -type EngineFlags struct { CGroupManager string CniConfigDir string ConmonPath string @@ -61,9 +57,9 @@ type EngineFlags struct { IgnoreHosts bool } -func NewEngineOptions() (EngineFlags, error) { +func NewEngineOptions() (EngineOptions, error) { u, _ := user.Current() - return EngineFlags{ + return EngineOptions{ CGroupManager: define.SystemdCgroupsManager, CniConfigDir: "", Config: "", |