summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-11 11:00:11 -0400
committerGitHub <noreply@github.com>2020-09-11 11:00:11 -0400
commit881f2dfe9221a65b0bcac8682dc3add12bfa6077 (patch)
treeed8728e6298aa53948101ab6b90c306712d171cd /pkg/domain/infra
parentd8a0db2e0b6de41731dc867c1cadaabbdda97624 (diff)
parent6b0864434ad2780160c06ba607c76b0325b60175 (diff)
downloadpodman-881f2dfe9221a65b0bcac8682dc3add12bfa6077.tar.gz
podman-881f2dfe9221a65b0bcac8682dc3add12bfa6077.tar.bz2
podman-881f2dfe9221a65b0bcac8682dc3add12bfa6077.zip
Merge pull request #7403 from QiWang19/runtime-flag
Add global options --runtime-flags
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/runtime_libpod.go8
1 files changed, 8 insertions, 0 deletions
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))