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 /cmd/podman | |
| 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 'cmd/podman')
| -rw-r--r-- | cmd/podman/images/build.go | 3 | ||||
| -rw-r--r-- | cmd/podman/root.go | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 400f960cc..6b8b5cedf 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -382,6 +382,9 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil } containerConfig := registry.PodmanConfig() + for _, arg := range containerConfig.RuntimeFlags { + runtimeFlags = append(runtimeFlags, "--"+arg) + } if containerConfig.Engine.CgroupManager == config.SystemdCgroupsManager { runtimeFlags = append(runtimeFlags, "--systemd-cgroup") } diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 749a5fbe7..a55239a3e 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -273,6 +273,7 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) { pFlags.StringVar(&opts.RegistriesConf, "registries-conf", "", "Path to a registries.conf to use for image processing") pFlags.StringVar(&opts.Runroot, "runroot", "", "Path to the 'run directory' where all state information is stored") pFlags.StringVar(&opts.RuntimePath, "runtime", "", "Path to the OCI-compatible binary used to run containers, default is /usr/bin/runc") + pFlags.StringArrayVar(&opts.RuntimeFlags, "runtime-flag", []string{}, "add global flags for the container runtime") // -s is deprecated due to conflict with -s on subcommands pFlags.StringVar(&opts.StorageDriver, "storage-driver", "", "Select which storage driver is used to manage storage of images and containers (default is overlay)") pFlags.StringArrayVar(&opts.StorageOpts, "storage-opt", []string{}, "Used to pass an option to the storage driver") |