Merge pull request #9309 from baude/issue9303

Display correct value for unlimited ulimit

3 files changed, 28 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.
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go
index 8fc9721f9..12bc886a8 100644
--- a/test/e2e/inspect_test.go
+++ b/test/e2e/inspect_test.go
@@ -466,4 +466,28 @@ var _ = Describe("Podman inspect", func() {
 		Expect(len(inspect)).To(Equal(1))
 		Expect(len(inspect[0].NetworkSettings.Networks)).To(Equal(1))
 	})
+
+	It("Container inspect with unlimited uilimits should be -1", func() {
+		ctrName := "testctr"
+		session := podmanTest.Podman([]string{"run", "-d", "--ulimit", "core=-1:-1", "--name", ctrName, ALPINE, "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(BeZero())
+
+		inspect := podmanTest.Podman([]string{"inspect", ctrName})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(BeZero())
+
+		data := inspect.InspectContainerToJSON()
+		ulimits := data[0].HostConfig.Ulimits
+		Expect(len(ulimits)).To(BeNumerically(">", 0))
+		found := false
+		for _, ulimit := range ulimits {
+			if ulimit.Name == "RLIMIT_CORE" {
+				found = true
+				Expect(ulimit.Soft).To(BeNumerically("==", -1))
+				Expect(ulimit.Hard).To(BeNumerically("==", -1))
+			}
+		}
+		Expect(found).To(BeTrue())
+	})
 })