diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-17 18:18:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 18:18:09 +0200 |
| commit | 1c02905ec7af9f63a35ee05e9e9ce594c45c4c58 (patch) | |
| tree | 9b170922e521f2c10cc3fff262fe6a55afa71a25 /pkg/spec/spec.go | |
| parent | 04a9cb01fec7a31a6ab4156f369a45399930e418 (diff) | |
| parent | 2f0ed531c7f90e1d2d51871c68de7c813c4931c4 (diff) | |
| download | podman-1c02905ec7af9f63a35ee05e9e9ce594c45c4c58.tar.gz podman-1c02905ec7af9f63a35ee05e9e9ce594c45c4c58.tar.bz2 podman-1c02905ec7af9f63a35ee05e9e9ce594c45c4c58.zip | |
Merge pull request #3583 from giuseppe/ulimit-host-not-set
spec: simplify handling of --ulimit host
Diffstat (limited to 'pkg/spec/spec.go')
| -rw-r--r-- | pkg/spec/spec.go | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 53b73296a..6d8d399f4 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -20,12 +20,6 @@ import ( const cpuPeriod = 100000 -type systemUlimit struct { - name string - max uint64 - cur uint64 -} - func getAvailableGids() (int64, error) { idMap, err := user.ParseIDMapFile("/proc/self/gid_map") if err != nil { @@ -585,13 +579,7 @@ func addRlimits(config *CreateConfig, g *generate.Generator) error { if len(config.Resources.Ulimit) != 1 { return errors.New("ulimit can use host only once") } - hostLimits, err := getHostRlimits() - if err != nil { - return err - } - for _, i := range hostLimits { - g.AddProcessRlimits(i.name, i.max, i.cur) - } + g.Config.Process.Rlimits = nil break } |