summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2021-08-02 21:16:01 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-08-04 12:52:34 -0400
commitddc360fe1778d8feeeca7c3790949f76eeedc2c3 (patch)
tree3eb6cbe6b531b38fc28f424c8bf04a9e47af1a72 /pkg/api
parent77f8c6549ab1df393f613cc13e93e8dcec859614 (diff)
downloadpodman-ddc360fe1778d8feeeca7c3790949f76eeedc2c3.tar.gz
podman-ddc360fe1778d8feeeca7c3790949f76eeedc2c3.tar.bz2
podman-ddc360fe1778d8feeeca7c3790949f76eeedc2c3.zip
Bump Buildah to v1.22.0 [NO TESTS NEEDED]
Bump Buildah to v1.22.0 in preparation for RHEL 8.5 and RHEL 9.0beta. Also bump c/common to v0.42.1 [NO TESTS NEEDED] Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/handlers/compat/images_build.go12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index 2c98a5361..08d1df4b8 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -73,10 +73,12 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
CacheFrom string `schema:"cachefrom"`
Compression uint64 `schema:"compression"`
ConfigureNetwork string `schema:"networkmode"`
- CpuPeriod uint64 `schema:"cpuperiod"` // nolint
- CpuQuota int64 `schema:"cpuquota"` // nolint
- CpuSetCpus string `schema:"cpusetcpus"` // nolint
- CpuShares uint64 `schema:"cpushares"` // nolint
+ CpuPeriod uint64 `schema:"cpuperiod"` // nolint
+ CpuQuota int64 `schema:"cpuquota"` // nolint
+ CpuSetCpus string `schema:"cpusetcpus"` // nolint
+ CpuSetMems string `schema:"cpusetmems"` // nolint
+ CpuShares uint64 `schema:"cpushares"` // nolint
+ CgroupParent string `schema:"cgroupparent"` // nolint
DNSOptions string `schema:"dnsoptions"`
DNSSearch string `schema:"dnssearch"`
DNSServers string `schema:"dnsservers"`
@@ -422,7 +424,9 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
CPUPeriod: query.CpuPeriod,
CPUQuota: query.CpuQuota,
CPUSetCPUs: query.CpuSetCpus,
+ CPUSetMems: query.CpuSetMems,
CPUShares: query.CpuShares,
+ CgroupParent: query.CgroupParent,
DNSOptions: dnsoptions,
DNSSearch: dnssearch,
DNSServers: dnsservers,