diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-06 09:17:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-06 09:17:32 +0000 |
| commit | 01190a397cd8342b3ae15ed286d49c880aaf35cf (patch) | |
| tree | fd23ee94ef3733cebc553552e29ba998d2ba6e2e /pkg/api | |
| parent | 57422d2093e2f03c8bf5101ac2eb8eb7f281c4de (diff) | |
| parent | 50c6cc229e168e35bed7860bd5ef3cec1f7427c7 (diff) | |
| download | podman-01190a397cd8342b3ae15ed286d49c880aaf35cf.tar.gz podman-01190a397cd8342b3ae15ed286d49c880aaf35cf.tar.bz2 podman-01190a397cd8342b3ae15ed286d49c880aaf35cf.zip | |
Merge pull request #11147 from TomSweeneyRedHat/dev/tsweeney/buildah3.3
[v3.3] Bump to Buildah v1.22.0 [NO NEW TESTS NEEDED]
Diffstat (limited to 'pkg/api')
| -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, |