diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-09 14:58:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 14:58:28 -0500 |
| commit | 6db3e9bfeb39e26bf6c211328c77bd847ff140f5 (patch) | |
| tree | 2baa1845c8d5ebe92f0772ba3116e81b6ab03251 /pkg | |
| parent | da062b5bd03dd88060eb91c7d02936d5e7427cb9 (diff) | |
| parent | 0154f9e9b3d158dce901c9f19261714660a2f27b (diff) | |
| download | podman-6db3e9bfeb39e26bf6c211328c77bd847ff140f5.tar.gz podman-6db3e9bfeb39e26bf6c211328c77bd847ff140f5.tar.bz2 podman-6db3e9bfeb39e26bf6c211328c77bd847ff140f5.zip | |
Merge pull request #8653 from rhatdan/buildah
Honor the --layers flag
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/images/build.go | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 43478c1d3..415ff85cd 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -71,6 +71,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { ForceRm bool `schema:"forcerm"` HTTPProxy bool `schema:"httpproxy"` Labels string `schema:"labels"` + Layers bool `schema:"layers"` MemSwap int64 `schema:"memswap"` Memory int64 `schema:"memory"` NetworkMode string `schema:"networkmode"` @@ -165,6 +166,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { Registry: query.Registry, IgnoreUnrecognizedInstructions: true, Quiet: query.Quiet, + Layers: query.Layers, Isolation: buildah.IsolationChroot, Compression: archive.Gzip, Args: buildArgs, diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 815ab4e86..d34ab87d9 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -41,6 +41,9 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO if options.NoCache { params.Set("nocache", "1") } + if options.Layers { + params.Set("layers", "1") + } // TODO cachefrom if options.PullPolicy == buildah.PullAlways { params.Set("pull", "1") |