diff options
| -rw-r--r-- | cmd/podman/build.go | 9 | ||||
| -rw-r--r-- | pkg/adapter/runtime_remote.go | 12 |
2 files changed, 21 insertions, 0 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index 14ac51889..8eb12cacd 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -10,6 +10,7 @@ import ( "github.com/containers/buildah/imagebuildah" buildahcli "github.com/containers/buildah/pkg/cli" "github.com/containers/libpod/cmd/podman/cliconfig" + "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/adapter" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" @@ -225,6 +226,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 != nil && conf.CgroupManager == libpod.SystemdCgroupsManager { + runtimeFlags = append(runtimeFlags, "--systemd-cgroup") + } // end from buildah defer runtime.DeferredShutdown(false) diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go index 8588966b6..718a6d542 100644 --- a/pkg/adapter/runtime_remote.go +++ b/pkg/adapter/runtime_remote.go @@ -113,6 +113,18 @@ func (r RemoteRuntime) DeferredShutdown(force bool) { } } +// RuntimeConfig is a bogus wrapper for compat with the libpod runtime +type RuntimeConfig struct { + // CGroupManager is the CGroup Manager to use + // Valid values are "cgroupfs" and "systemd" + CgroupManager string +} + +// Shutdown is a bogus wrapper for compat with the libpod runtime +func (r *RemoteRuntime) GetConfig() (*RuntimeConfig, error) { + return nil, nil +} + // Shutdown is a bogus wrapper for compat with the libpod runtime func (r RemoteRuntime) Shutdown(force bool) error { return nil |