diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-10 18:36:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 18:36:38 -0500 |
| commit | db64865164b72af7017e9d3c34e75ee3bfd8546e (patch) | |
| tree | dfea8a5dee7c99b4ae103a074e92fa805da85f93 /libpod | |
| parent | 4d604c10897da33b7b3677631d219481cec11c7f (diff) | |
| parent | 5ccb1596b444e15cbefa55e3315e742f091af9d4 (diff) | |
| download | podman-db64865164b72af7017e9d3c34e75ee3bfd8546e.tar.gz podman-db64865164b72af7017e9d3c34e75ee3bfd8546e.tar.bz2 podman-db64865164b72af7017e9d3c34e75ee3bfd8546e.zip | |
Merge pull request #9309 from baude/issue9303
Display correct value for unlimited ulimit
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 4 | ||||
| -rw-r--r-- | libpod/define/container_inspect.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index f50c7dbfe..efe09af92 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -871,8 +871,8 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named for _, limit := range ctrSpec.Process.Rlimits { newLimit := define.InspectUlimit{} newLimit.Name = limit.Type - newLimit.Soft = limit.Soft - newLimit.Hard = limit.Hard + newLimit.Soft = int64(limit.Soft) + newLimit.Hard = int64(limit.Hard) hostConfig.Ulimits = append(hostConfig.Ulimits, newLimit) } } diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 2cdd53cbc..0f355d20a 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -122,9 +122,9 @@ type InspectUlimit struct { // Name is the name (type) of the ulimit. Name string `json:"Name"` // Soft is the soft limit that will be applied. - Soft uint64 `json:"Soft"` + Soft int64 `json:"Soft"` // Hard is the hard limit that will be applied. - Hard uint64 `json:"Hard"` + Hard int64 `json:"Hard"` } // InspectDevice is a single device that will be mounted into the container. |