opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9903 from rhatdan/rusage

Browse Source 
Fix handling of remote --log-rusage param
This commit is contained in:
OpenShift Merge Robot
2021-03-31 18:19:53 +02:00
committed by GitHub
parent 24a0262bc0 ab7c83392b
commit 78b4dcf476
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/handlers/compat/images_build.go
View File

@ -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,

17
test/e2e/build_test.go
View File

@ -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)"))
})
})