diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-31 19:21:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 19:21:46 +0100 |
| commit | 3e2d9f8662663f2f703bf674408d5255e493e18e (patch) | |
| tree | d27099f29c134e4351c98674d72cf42abf5efbe8 /cmd/podman/build.go | |
| parent | 1e750f7ca874ed24781de27cccf0346e5ec247bf (diff) | |
| parent | 11c282ab02e5e7daca0b13a3ddc9bbc4468e7a31 (diff) | |
| download | podman-3e2d9f8662663f2f703bf674408d5255e493e18e.tar.gz podman-3e2d9f8662663f2f703bf674408d5255e493e18e.tar.bz2 podman-3e2d9f8662663f2f703bf674408d5255e493e18e.zip | |
Merge pull request #4352 from vrothberg/config-package
refactor libpod config into libpod/config
Diffstat (limited to 'cmd/podman/build.go')
| -rw-r--r-- | cmd/podman/build.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index e9ebc50aa..896d5661a 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -11,7 +11,7 @@ import ( buildahcli "github.com/containers/buildah/pkg/cli" "github.com/containers/image/v5/types" "github.com/containers/libpod/cmd/podman/cliconfig" - "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/adapter" "github.com/docker/go-units" "github.com/opencontainers/runtime-spec/specs-go" @@ -260,7 +260,7 @@ func buildCmd(c *cliconfig.BuildValues) error { if err != nil { return err } - if conf != nil && conf.CgroupManager == libpod.SystemdCgroupsManager { + if conf != nil && conf.CgroupManager == define.SystemdCgroupsManager { runtimeFlags = append(runtimeFlags, "--systemd-cgroup") } // end from buildah |