summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-30 05:30:22 -0400
committerGitHub <noreply@github.com>2021-06-30 05:30:22 -0400
commit0d8d805a76762276c62bd7260a39eb26e99722b4 (patch)
tree9a3ead552f88cf53eab2878480fc0500533b2ceb /pkg
parent4dc87c2a3a45db32fbded8b4a0a23d874b3e464a (diff)
parent05f39af5bd716ce8d02a41e5c0aa1a2d632dab07 (diff)
downloadpodman-0d8d805a76762276c62bd7260a39eb26e99722b4.tar.gz
podman-0d8d805a76762276c62bd7260a39eb26e99722b4.tar.bz2
podman-0d8d805a76762276c62bd7260a39eb26e99722b4.zip
Merge pull request #10761 from containers/dependabot/go_modules/github.com/containers/storage-1.32.4
Bump github.com/containers/storage from 1.32.3 to 1.32.4
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/images_build.go2
-rw-r--r--pkg/bindings/images/build.go3
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index e933b9811..64805b7fa 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -106,6 +106,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
Quiet bool `schema:"q"`
Registry string `schema:"registry"`
Rm bool `schema:"rm"`
+ RusageLogFile string `schema:"rusagelogfile"`
Seccomp string `schema:"seccomp"`
SecurityOpt string `schema:"securityopt"`
ShmSize int `schema:"shmsize"`
@@ -463,6 +464,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
Registry: registry,
RemoveIntermediateCtrs: query.Rm,
ReportWriter: reporter,
+ RusageLogFile: query.RusageLogFile,
Squash: query.Squash,
Target: query.Target,
SystemContext: &types.SystemContext{
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index 937d05330..95d9d4df7 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -178,6 +178,9 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
if options.LogRusage {
params.Set("rusage", "1")
}
+ if len(options.RusageLogFile) > 0 {
+ params.Set("rusagelogfile", options.RusageLogFile)
+ }
if len(options.Manifest) > 0 {
params.Set("manifest", options.Manifest)
}