diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-24 16:25:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 16:25:41 -0400 |
| commit | 0b9143df881f5de0f36f31bc2598e864fdeae7ed (patch) | |
| tree | 76ed319444ac750d898d06b986adf8341ed605ef /cmd/podman/images | |
| parent | 4af2081424c8fa7ac191e9c5231d2429edb8327c (diff) | |
| parent | 915f8698f4f84fb79cf0438a5b6e4a283e75a7bf (diff) | |
| download | podman-0b9143df881f5de0f36f31bc2598e864fdeae7ed.tar.gz podman-0b9143df881f5de0f36f31bc2598e864fdeae7ed.tar.bz2 podman-0b9143df881f5de0f36f31bc2598e864fdeae7ed.zip | |
Merge pull request #6758 from mheon/v2.0.1_backports
V2.0.1 backports
Diffstat (limited to 'cmd/podman/images')
| -rw-r--r-- | cmd/podman/images/build.go | 20 | ||||
| -rw-r--r-- | cmd/podman/images/load.go | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index 2efc795cd..23bfcab79 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -9,6 +9,7 @@ import ( "github.com/containers/buildah/imagebuildah" buildahCLI "github.com/containers/buildah/pkg/cli" "github.com/containers/buildah/pkg/parse" + "github.com/containers/common/pkg/config" "github.com/containers/libpod/cmd/podman/registry" "github.com/containers/libpod/cmd/podman/utils" "github.com/containers/libpod/pkg/domain/entities" @@ -396,16 +397,10 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil runtimeFlags = append(runtimeFlags, "--"+arg) } - // FIXME: the code below needs to be enabled (and adjusted) once the - // global/root flags are supported. - - // conf, err := runtime.GetConfig() - // if err != nil { - // return err - // } - // if conf != nil && conf.Engine.CgroupManager == config.SystemdCgroupsManager { - // runtimeFlags = append(runtimeFlags, "--systemd-cgroup") - // } + containerConfig := registry.PodmanConfig() + if containerConfig.Engine.CgroupManager == config.SystemdCgroupsManager { + runtimeFlags = append(runtimeFlags, "--systemd-cgroup") + } opts := imagebuildah.BuildOptions{ AddCapabilities: flags.CapAdd, @@ -418,12 +413,13 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil CNIPluginPath: flags.CNIPlugInPath, CommonBuildOpts: &buildah.CommonBuildOptions{ AddHost: flags.AddHost, - CgroupParent: flags.CgroupParent, CPUPeriod: flags.CPUPeriod, CPUQuota: flags.CPUQuota, - CPUShares: flags.CPUShares, CPUSetCPUs: flags.CPUSetCPUs, CPUSetMems: flags.CPUSetMems, + CPUShares: flags.CPUShares, + CgroupParent: flags.CgroupParent, + HTTPProxy: flags.HTTPProxy, Memory: memoryLimit, MemorySwap: memorySwap, ShmSize: flags.ShmSize, diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index a984ad81f..115e9a070 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -30,7 +30,7 @@ var ( } imageLoadCommand = &cobra.Command{ - Args: cobra.MinimumNArgs(1), + Args: loadCommand.Args, Use: loadCommand.Use, Short: loadCommand.Short, Long: loadCommand.Long, |