diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2021-08-05 14:18:12 -0400 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2021-08-05 14:59:19 -0400 |
| commit | 50c6cc229e168e35bed7860bd5ef3cec1f7427c7 (patch) | |
| tree | fd23ee94ef3733cebc553552e29ba998d2ba6e2e /pkg/api/handlers/compat | |
| parent | 57422d2093e2f03c8bf5101ac2eb8eb7f281c4de (diff) | |
| download | podman-50c6cc229e168e35bed7860bd5ef3cec1f7427c7.tar.gz podman-50c6cc229e168e35bed7860bd5ef3cec1f7427c7.tar.bz2 podman-50c6cc229e168e35bed7860bd5ef3cec1f7427c7.zip | |
[v3.3] Bump to Buildah v1.22.0
[NO TESTS NEEDED]
Bump Buildah to v1.22.0 and c/common to v0.42.1
and adds a patch for cpu handling.
Based on #1132
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
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, |