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

1 files changed, 8 insertions, 4 deletions

diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md
index 90f4029bb..b49f60329 100644
--- a/docs/podman-build.1.md
+++ b/docs/podman-build.1.md
@@ -160,9 +160,9 @@ If a build context is not specified, and at least one Dockerfile is a
 local file, the directory in which it resides will be used as the build
 context.
 
-**--force-rm**
+**--force-rm** *bool-value*
 
-Always remove intermediate containers after a build. Podman does not currently support caching so this is a NOOP.
+Always remove intermediate containers after a build, even if the build is unsuccessful.
 
 **--format**
 
@@ -264,9 +264,9 @@ Suppress output messages which indicate which instruction is being processed,
 and of progress when pulling images from a registry, and when writing the
 output image.
 
-**--rm**
+**--rm** *bool-value*
 
-Remove intermediate containers after a successful build. Podman does not currently support caching so this is a NOOP.
+Remove intermediate containers after a successful build (default true).
 
 **--runtime** *path*
 
@@ -510,6 +510,10 @@ podman build --layers -t imageName .
 
 podman build --no-cache -t imageName .
 
+podman build --layers --force-rm -t imageName .
+
+podman build --no-cache --rm=false -t imageName .
+
 ### Building an image using a URL, Git repo, or archive
 
   The build context directory can be specified as a URL to a Dockerfile, a Git repository, or URL to an archive. If the URL is a Dockerfile, it is downloaded to a temporary location and used as the context. When a Git repository is set as the URL, the repository is cloned locally to a temporary location and then used as the context. Lastly, if the URL is an archive, it is downloaded to a temporary location and extracted before being used as the context.