diff options
| author | umohnani8 <umohnani@redhat.com> | 2018-06-14 13:25:03 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-14 19:24:37 +0000 |
| commit | 6bdf023aeace52d47eb59697bfc46a8d2278b86d (patch) | |
| tree | 9ff996319214a4fee381f7ca2ebd60c49312d7b5 /vendor/github.com/projectatomic/buildah/pkg | |
| parent | c1ef1151ac5b1e3845562c10f5b5fcc8b1b82ecf (diff) | |
| download | podman-6bdf023aeace52d47eb59697bfc46a8d2278b86d.tar.gz podman-6bdf023aeace52d47eb59697bfc46a8d2278b86d.tar.bz2 podman-6bdf023aeace52d47eb59697bfc46a8d2278b86d.zip | |
Vendor in latest projectatomic/buildah
Adds --rm and --force-rm to podman build.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #945
Approved by: rhatdan
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/pkg')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/pkg/cli/common.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go index d00ebbdc5..554b30a29 100644 --- a/vendor/github.com/projectatomic/buildah/pkg/cli/common.go +++ b/vendor/github.com/projectatomic/buildah/pkg/cli/common.go @@ -10,12 +10,12 @@ import ( "strings" "github.com/opencontainers/runtime-spec/specs-go" - "github.com/projectatomic/buildah" "github.com/projectatomic/buildah/util" "github.com/urfave/cli" ) var ( + runtime = util.Runtime() usernsFlags = []cli.Flag{ cli.StringFlag{ Name: "userns", @@ -109,7 +109,7 @@ var ( }, cli.BoolFlag{ Name: "force-rm", - Usage: "Always remove intermediate containers after a build. The build process does not currently support caching so this is a NOOP.", + Usage: "Always remove intermediate containers after a build, even if the build is unsuccessful.", }, cli.StringFlag{ Name: "format", @@ -147,14 +147,14 @@ var ( Name: "quiet, q", Usage: "refrain from announcing build instructions and image read/write progress", }, - cli.BoolFlag{ + cli.BoolTFlag{ Name: "rm", - Usage: "Remove intermediate containers after a successful build. The build process does not currently support caching so this is a NOOP.", + Usage: "Remove intermediate containers after a successful build (default true)", }, cli.StringFlag{ Name: "runtime", Usage: "`path` to an alternate runtime", - Value: buildah.DefaultRuntime, + Value: runtime, }, cli.StringSliceFlag{ Name: "runtime-flag", |