diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 16:53:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 16:53:53 -0400 |
| commit | 1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5 (patch) | |
| tree | 866af472bdba64c36c8527bcba6101e49a6137da /cmd/podman/common/specgen.go | |
| parent | ce07f1cde8315e367da99c843609ff1a52a27f9d (diff) | |
| parent | bc56236102990c6719b7d185bc13c7c70240d211 (diff) | |
| download | podman-1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5.tar.gz podman-1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5.tar.bz2 podman-1ad978a3d7dabbf1952fe7ecefe444deb7c8d8f5.zip | |
Merge pull request #5919 from rhatdan/v2
Lots more fixes for V2 conversion.
Diffstat (limited to 'cmd/podman/common/specgen.go')
| -rw-r--r-- | cmd/podman/common/specgen.go | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index fc0167461..1e857ea01 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -123,7 +123,7 @@ func getPidsLimits(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string) pids.Limit = c.PIDsLimit hasLimits = true } - if c.CGroups == "disabled" && c.PIDsLimit > 0 { + if c.CGroupsMode == "disabled" && c.PIDsLimit > 0 { s.ResourceLimits.Pids.Limit = -1 } if !hasLimits { @@ -472,12 +472,11 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string if ld := c.LogDriver; len(ld) > 0 { s.LogConfiguration.Driver = ld } + s.CgroupParent = c.CGroupParent + s.CgroupsMode = c.CGroupsMode // TODO WTF //cgroup := &cc.CgroupConfig{ - // Cgroups: c.String("cgroups"), // Cgroupns: c.String("cgroupns"), - // CgroupParent: c.String("cgroup-parent"), - // CgroupMode: cgroupMode, //} // //userns := &cc.UserConfig{ @@ -494,6 +493,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string // Hostname: c.String("hostname"), //} + s.Hostname = c.Hostname sysctl := map[string]string{} if ctl := c.Sysctl; len(ctl) > 0 { sysctl, err = util.ValidateSysctls(ctl) @@ -561,14 +561,9 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string //s.Mounts = c.Mount s.VolumesFrom = c.VolumesFrom - // TODO any idea why this was done - //devices := rtc.Containers.Devices - // TODO conflict on populate? - // - //if c.Changed("device") { - // devices = append(devices, c.StringSlice("device")...) - //} - + for _, dev := range c.Devices { + s.Devices = append(s.Devices, specs.LinuxDevice{Path: dev}) + } // TODO things i cannot find in spec // we dont think these are in the spec // init - initbinary |