diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-27 06:37:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-27 06:37:19 -0400 |
| commit | a72b2402c9569028abbff2364f4f40f4728e5688 (patch) | |
| tree | ef975a49b5004b68c27889b9e7d5653b6fbd9a3d /pkg/bindings/images/build.go | |
| parent | bdcf453118115b5999183e0f4cf48f5e82cda12f (diff) | |
| parent | 66a56ce05a577913a66c3d3f98c47cbe6cb4a3c0 (diff) | |
| download | podman-a72b2402c9569028abbff2364f4f40f4728e5688.tar.gz podman-a72b2402c9569028abbff2364f4f40f4728e5688.tar.bz2 podman-a72b2402c9569028abbff2364f4f40f4728e5688.zip | |
Merge pull request #14320 from flouthoc/build-honor-squash-and-layers
build: allow using `cache` explicitly with `--squash-all` using `--layers`
Diffstat (limited to 'pkg/bindings/images/build.go')
| -rw-r--r-- | pkg/bindings/images/build.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go index 51dcd2aa5..b4b7c36f6 100644 --- a/pkg/bindings/images/build.go +++ b/pkg/bindings/images/build.go @@ -65,6 +65,14 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO params.Set("annotations", l) } + if cppflags := options.CPPFlags; len(cppflags) > 0 { + l, err := jsoniter.MarshalToString(cppflags) + if err != nil { + return nil, err + } + params.Set("cppflags", l) + } + if options.AllPlatforms { params.Add("allplatforms", "1") } |