diff options
| author | Aditya R <arajan@redhat.com> | 2022-05-25 01:54:25 +0530 |
|---|---|---|
| committer | Aditya R <arajan@redhat.com> | 2022-05-26 21:01:31 +0530 |
| commit | 66a56ce05a577913a66c3d3f98c47cbe6cb4a3c0 (patch) | |
| tree | 6f0be19d2b25a00bde9b4693693614291b5f254f /pkg/api/handlers/compat | |
| parent | 6124b51993b0a8010b7b276086cf4464e168932a (diff) | |
| download | podman-66a56ce05a577913a66c3d3f98c47cbe6cb4a3c0.tar.gz podman-66a56ce05a577913a66c3d3f98c47cbe6cb4a3c0.tar.bz2 podman-66a56ce05a577913a66c3d3f98c47cbe6cb4a3c0.zip | |
vendor: bump buildah to v1.26.1-0.20220524184833-5500333c2e06
Bump buildah to v1.26.1-0.20220524184833-5500333c2e06
Signed-off-by: Aditya R <arajan@redhat.com>
Diffstat (limited to 'pkg/api/handlers/compat')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index ba6764e91..f47aa523e 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -80,6 +80,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { CgroupParent string `schema:"cgroupparent"` // nolint Compression uint64 `schema:"compression"` ConfigureNetwork string `schema:"networkmode"` + CPPFlags string `schema:"cppflags"` CpuPeriod uint64 `schema:"cpuperiod"` // nolint CpuQuota int64 `schema:"cpuquota"` // nolint CpuSetCpus string `schema:"cpusetcpus"` // nolint @@ -399,6 +400,15 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { } } + // convert cppflags formats + var cppflags = []string{} + if _, found := r.URL.Query()["cppflags"]; found { + if err := json.Unmarshal([]byte(query.CPPFlags), &cppflags); err != nil { + utils.BadRequest(w, "cppflags", query.CPPFlags, err) + return + } + } + // convert nsoptions formats nsoptions := buildah.NamespaceOptions{} if _, found := r.URL.Query()["nsoptions"]; found { @@ -555,6 +565,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { AddCapabilities: addCaps, AdditionalTags: additionalTags, Annotations: annotations, + CPPFlags: cppflags, Args: buildArgs, AllPlatforms: query.AllPlatforms, CommonBuildOpts: &buildah.CommonBuildOptions{ |