summaryrefslogtreecommitdiff
path: root/cmd/podman/images/build.go
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 /cmd/podman/images/build.go
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 'cmd/podman/images/build.go')
-rw-r--r--cmd/podman/images/build.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 923109b15..ff5c6ec09 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -386,6 +386,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")
}