diff options
| author | Qi Wang <qiwan@redhat.com> | 2020-08-21 13:56:50 -0400 |
|---|---|---|
| committer | Qi Wang <qiwan@redhat.com> | 2020-09-04 15:04:36 -0400 |
| commit | 6b0864434ad2780160c06ba607c76b0325b60175 (patch) | |
| tree | 6d352ca8204e5f7c5e2ff1266248ff35d1cb9a19 /pkg | |
| parent | fa487a65220951e84779f200f48780666b4b9209 (diff) | |
| download | podman-6b0864434ad2780160c06ba607c76b0325b60175.tar.gz podman-6b0864434ad2780160c06ba607c76b0325b60175.tar.bz2 podman-6b0864434ad2780160c06ba607c76b0325b60175.zip | |
Add global options --runtime-flags
Add global options --runtime-flags for setting options to container runtime.
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/entities/engine.go | 1 | ||||
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go index 6776d09e9..f23d964e5 100644 --- a/pkg/domain/entities/engine.go +++ b/pkg/domain/entities/engine.go @@ -46,6 +46,7 @@ type PodmanConfig struct { RegistriesConf string // allows for specifying a custom registries.conf Remote bool // Connection to Podman API Service will use RESTful API RuntimePath string // --runtime flag will set Engine.RuntimePath + RuntimeFlags []string // global flags for the container runtime Span opentracing.Span // tracing object SpanCloser io.Closer // Close() for tracing object SpanCtx context.Context // context to use when tracing diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index a88347e24..f9b8106ef 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -156,6 +156,14 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo options = append(options, libpod.WithRenumber()) } + if len(cfg.RuntimeFlags) > 0 { + runtimeFlags := []string{} + for _, arg := range cfg.RuntimeFlags { + runtimeFlags = append(runtimeFlags, "--"+arg) + } + options = append(options, libpod.WithRuntimeFlags(runtimeFlags)) + } + // Only set this if the user changes storage config on the command line if storageSet { options = append(options, libpod.WithStorageConfig(storageOpts)) |