opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of remove --log-rusage param

Browse Source 
Fixes: https://github.com/containers/podman/issues/9889

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2021-03-31 07:37:36 -04:00
parent a373e2fdf3
commit ab7c83392b
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, Jobs: &jobs,
Labels: labels, Labels: labels,
Layers: query.Layers, Layers: query.Layers,
LogRusage: query.LogRusage,
Manifest: query.Manifest, Manifest: query.Manifest,
MaxPullPushRetries: 3, MaxPullPushRetries: 3,
NamespaceOptions: nsoptions, NamespaceOptions: nsoptions,

17
test/e2e/build_test.go
View File

@ -549,4 +549,21 @@ RUN echo hello`, ALPINE)
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect.OutputToString()).To(Equal("1970-01-01 00:00:00 +0000 UTC")) 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)"))
})
}) })