Skip to content

Commit

Permalink
build: pass down the cgroup manager to buildah
Browse files Browse the repository at this point in the history
Pass down the cgroup manager to use to buildah.

Closes: containers#3938

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
  • Loading branch information
giuseppe committed Sep 5, 2019
1 parent e74fcd7 commit d43269b
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions cmd/podman/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,14 @@ func buildCmd(c *cliconfig.BuildValues) error {
for _, arg := range c.RuntimeFlags {
runtimeFlags = append(runtimeFlags, "--"+arg)
}

conf, err := runtime.GetConfig()
if err != nil {
return err
}
if conf.CgroupManager == "systemd" {
runtimeFlags = append(runtimeFlags, "--systemd")
}
// end from buildah

defer runtime.DeferredShutdown(false)
Expand Down

0 comments on commit d43269b

Please sign in to comment.