diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-04 18:52:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 18:52:34 +0000 |
| commit | 571547b19f56fd5d842169687bc9033d0b3ceb0f (patch) | |
| tree | 5394d315fb8209f07fab9655f58b259d95f68c93 /pkg/api/handlers/compat | |
| parent | c887018571ac6dc7c3eeb1d039685d4606850311 (diff) | |
| parent | ddc360fe1778d8feeeca7c3790949f76eeedc2c3 (diff) | |
| download | podman-571547b19f56fd5d842169687bc9033d0b3ceb0f.tar.gz podman-571547b19f56fd5d842169687bc9033d0b3ceb0f.tar.bz2 podman-571547b19f56fd5d842169687bc9033d0b3ceb0f.zip | |
Merge pull request #11132 from rhatdan/VENDOR
Bump Buildah to v1.22.0 [NO TESTS NEEDED]
Diffstat (limited to 'pkg/api/handlers/compat')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 12 |
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, |