summaryrefslogtreecommitdiff
path: root/cmd/podman/cliconfig
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-15 12:21:17 +0200
committerGitHub <noreply@github.com>2019-10-15 12:21:17 +0200
commit935802575b78bb26d0cd9be1ce87562de62570ee (patch)
tree10bd2fbe3078696e947e31fcabce1181e7a2915a /cmd/podman/cliconfig
parent25572cefa8f16580c4a61af86cf2c41281e0300f (diff)
parentbeadd2694b048f939cad1f4d32676fca4c84d0bd (diff)
downloadpodman-935802575b78bb26d0cd9be1ce87562de62570ee.tar.gz
podman-935802575b78bb26d0cd9be1ce87562de62570ee.tar.bz2
podman-935802575b78bb26d0cd9be1ce87562de62570ee.zip
Merge pull request #4215 from TomSweeneyRedHat/dev/tsweeney/fixsquash
Add squash-all, fix squash option in build
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 {