summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authoropenshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com>2022-06-14 14:55:21 +0000
committerGitHub <noreply@github.com>2022-06-14 14:55:21 +0000
commitcffed099b8404fa7f136643116020edac2336155 (patch)
treeac5cced17ea86cca6f4b79dc0f95856dd0663649 /pkg
parent78ecdad5f8f16dbb6146f2741a3d7ead1ce837bc (diff)
parent5e9d20448c52fd134ac990e9f897cbc378760fce (diff)
downloadpodman-cffed099b8404fa7f136643116020edac2336155.tar.gz
podman-cffed099b8404fa7f136643116020edac2336155.tar.bz2
podman-cffed099b8404fa7f136643116020edac2336155.zip
Merge pull request #14561 from rhatdan/VENDOR
Update vendor of containers/buildah
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/compat/images_build.go2
-rw-r--r--pkg/bindings/images/build.go5
2 files changed, 7 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index fe17aa1d4..7e599f4d3 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -111,6 +111,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
Memory int64 `schema:"memory"`
NamespaceOptions string `schema:"nsoptions"`
NoCache bool `schema:"nocache"`
+ OmitHistory bool `schema:"omithistory"`
OSFeatures []string `schema:"osfeature"`
OSVersion string `schema:"osversion"`
OutputFormat string `schema:"outputformat"`
@@ -595,6 +596,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
LabelOpts: labelOpts,
Memory: query.Memory,
MemorySwap: query.MemSwap,
+ OmitHistory: query.OmitHistory,
SeccompProfilePath: seccomp,
ShmSize: strconv.Itoa(query.ShmSize),
Ulimit: ulimits,
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index fe81dc662..72fed6bd5 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -170,6 +170,11 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
} else {
params.Set("rm", "0")
}
+ if options.CommonBuildOpts.OmitHistory {
+ params.Set("omithistory", "1")
+ } else {
+ params.Set("omithistory", "0")
+ }
if len(options.From) > 0 {
params.Set("from", options.From)
}