summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-12-28 11:23:11 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2018-12-28 12:36:25 -0500
commit652a9859988f3f555a1f7e18518656eb9c9332e6 (patch)
treefe7b017f3813aa3272c3df57ded098b225abb53e /libpod
parentc50332d057a148f6ffa7879e99e969cf97af9878 (diff)
downloadpodman-652a9859988f3f555a1f7e18518656eb9c9332e6.tar.gz
podman-652a9859988f3f555a1f7e18518656eb9c9332e6.tar.bz2
podman-652a9859988f3f555a1f7e18518656eb9c9332e6.zip
podman build is not using the default oci-runtime
Currently if the user installs runc in an alternative path podman run uses it but podman build does not. This patch will pass the default oci runtime to be used by podman down to the image builder. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/info.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/info.go b/libpod/info.go
index 5d8d160c8..7044eba6a 100644
--- a/libpod/info.go
+++ b/libpod/info.go
@@ -180,6 +180,11 @@ func (r *Runtime) GetConmonVersion() (string, error) {
return strings.TrimSuffix(strings.Replace(output, "\n", ", ", 1), "\n"), nil
}
+// GetOCIRuntimePath returns the path to the OCI Runtime Path the runtime is using
+func (r *Runtime) GetOCIRuntimePath() string {
+ return r.ociRuntimePath
+}
+
// GetOCIRuntimeVersion returns a string representation of the oci runtimes version
func (r *Runtime) GetOCIRuntimeVersion() (string, error) {
output, err := utils.ExecCmd(r.ociRuntimePath, "--version")