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/util | |
| 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/util')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/util/util.go | 10 |
1 files changed, 10 insertions, 0 deletions
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 +} |