From 6bdf023aeace52d47eb59697bfc46a8d2278b86d Mon Sep 17 00:00:00 2001
From: umohnani8 <umohnani@redhat.com>
Date: Thu, 14 Jun 2018 13:25:03 -0400
Subject: 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
---
 vendor/github.com/projectatomic/buildah/util/util.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'vendor/github.com/projectatomic/buildah/util')

diff --git a/vendor/github.com/projectatomic/buildah/util/util.go b/vendor/github.com/projectatomic/buildah/util/util.go
index 3f1d7530c..8ac9f8a6c 100644
--- a/vendor/github.com/projectatomic/buildah/util/util.go
+++ b/vendor/github.com/projectatomic/buildah/util/util.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"net/url"
+	"os"
 	"path"
 	"strings"
 
@@ -233,3 +234,12 @@ func WriteError(w io.Writer, err error, lastError error) error {
 	}
 	return err
 }
+
+// Runtime is the default command to use to run the container.
+func Runtime() string {
+	runtime := os.Getenv("BUILDAH_RUNTIME")
+	if runtime != "" {
+		return runtime
+	}
+	return DefaultRuntime
+}
-- 
cgit v1.2.3-54-g00ecf