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
This commit is contained in:
umohnani8
2018-06-14 13:25:03 -04:00
committed by Atomic Bot
parent c1ef1151ac
commit 6bdf023aea
7 changed files with 158 additions and 99 deletions

View File

@@ -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
}