summaryrefslogtreecommitdiff
path: root/cmd/podman/cliconfig
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2019-10-07 19:55:56 -0400
committerTomSweeneyRedHat <tsweeney@redhat.com>2019-10-11 13:28:38 -0400
commitbeadd2694b048f939cad1f4d32676fca4c84d0bd (patch)
tree0409e9ee960edec17169464a7e38552d1a27a606 /cmd/podman/cliconfig
parenteb6ca054fc93e5f863581e72923cb1e80fc5ab88 (diff)
downloadpodman-beadd2694b048f939cad1f4d32676fca4c84d0bd.tar.gz
podman-beadd2694b048f939cad1f4d32676fca4c84d0bd.tar.bz2
podman-beadd2694b048f939cad1f4d32676fca4c84d0bd.zip
Add squash-all, fix squash option in build
Translate the podman build --squash command to podman build --layers=false which has the same functionality as docker build --squash. Add a new option --squash-all which will squash all layers into one. This will be translated to buildah bud --squash for the buildah bud api. Also allow only one option, squash, layers or squash--all to be used per build command. Fixes: https://github.com/containers/buildah/issues/1234 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'cmd/podman/cliconfig')
-rw-r--r--cmd/podman/cliconfig/create.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/cmd/podman/cliconfig/create.go b/cmd/podman/cliconfig/create.go
index 5fb2eed10..c27dfbbee 100644
--- a/cmd/podman/cliconfig/create.go
+++ b/cmd/podman/cliconfig/create.go
@@ -12,13 +12,20 @@ type RunValues struct {
PodmanCommand
}
+// PodmanBuildResults represents the results for Podman Build flags
+// that are unique to Podman.
+type PodmanBuildResults struct {
+ SquashAll bool
+}
+
type BuildValues struct {
PodmanCommand
*buildahcli.BudResults
*buildahcli.UserNSResults
*buildahcli.FromAndBudResults
- *buildahcli.NameSpaceResults
*buildahcli.LayerResults
+ *buildahcli.NameSpaceResults
+ *PodmanBuildResults
}
type CpValues struct {