diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-28 11:23:11 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-28 12:36:25 -0500 |
| commit | 652a9859988f3f555a1f7e18518656eb9c9332e6 (patch) | |
| tree | fe7b017f3813aa3272c3df57ded098b225abb53e | |
| parent | c50332d057a148f6ffa7879e99e969cf97af9878 (diff) | |
| download | podman-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>
| -rw-r--r-- | cmd/podman/build.go | 6 | ||||
| -rw-r--r-- | libpod/info.go | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/cmd/podman/build.go b/cmd/podman/build.go index 880cb892f..02a125aab 100644 --- a/cmd/podman/build.go +++ b/cmd/podman/build.go @@ -205,6 +205,10 @@ func buildCmd(c *cli.Context) error { } namespaceOptions.AddOrReplace(usernsOption...) + ociruntime := runtime.GetOCIRuntimePath() + if c.IsSet("runtime") { + ociruntime = c.String("runtime") + } options := imagebuildah.BuildOptions{ ContextDirectory: contextDir, PullPolicy: pullPolicy, @@ -217,7 +221,7 @@ func buildCmd(c *cli.Context) error { Out: stdout, Err: stderr, ReportWriter: reporter, - Runtime: c.String("runtime"), + Runtime: ociruntime, RuntimeArgs: runtimeFlags, OutputFormat: format, SystemContext: systemContext, 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") |