diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-12-08 16:26:51 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-12-09 08:31:36 -0500 |
| commit | 0154f9e9b3d158dce901c9f19261714660a2f27b (patch) | |
| tree | 443901e8929a17f10ecc28d801cf8b86cba63cad /pkg | |
| parent | 247260081a5cdc4065009bcd1080c987974327e5 (diff) | |
| download | podman-0154f9e9b3d158dce901c9f19261714660a2f27b.tar.gz podman-0154f9e9b3d158dce901c9f19261714660a2f27b.tar.bz2 podman-0154f9e9b3d158dce901c9f19261714660a2f27b.zip | |
Honor the --layers flag
Currently the --layers flag set by the user is ignored, and only the BUILDAH_LAYERS
environment variable being set is observed.
Fixes: https://github.com/containers/podman/issues/8643
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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") |