Merge pull request #9903 from rhatdan/rusage

Fix handling of remote --log-rusage param
containers · Mar 31, 2021 · 78b4dcf · 78b4dcf
2 parents 24a0262 + ab7c833
commit 78b4dcf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
@@ -349,6 +349,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
 		Jobs:                           &jobs,
 		Labels:                         labels,
 		Layers:                         query.Layers,
+		LogRusage:                      query.LogRusage,
 		Manifest:                       query.Manifest,
 		MaxPullPushRetries:             3,
 		NamespaceOptions:               nsoptions,

diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
@@ -549,4 +549,21 @@ RUN echo hello`, ALPINE)
 		inspect.WaitWithDefaultTimeout()
 		Expect(inspect.OutputToString()).To(Equal("1970-01-01 00:00:00 +0000 UTC"))
 	})
+
+	It("podman build --log-rusage", func() {
+		targetPath, err := CreateTempDirInTempDir()
+		Expect(err).To(BeNil())
+
+		containerFile := filepath.Join(targetPath, "Containerfile")
+		content := `FROM scratch`
+
+		Expect(ioutil.WriteFile(containerFile, []byte(content), 0755)).To(BeNil())
+
+		session := podmanTest.Podman([]string{"build", "--log-rusage", "--pull-never", targetPath})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session.OutputToString()).To(ContainSubstring("(system)"))
+		Expect(session.OutputToString()).To(ContainSubstring("(user)"))
+		Expect(session.OutputToString()).To(ContainSubstring("(elapsed)"))
+	})
 })