diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-28 17:44:35 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-28 17:44:35 -0800 |
| commit | 1438d5471f4cb23493f65b7df3f30fbb95e565cd (patch) | |
| tree | e8de59a3f2c7563048ae176eea8d7ed1959221e2 /cmd/podman | |
| parent | 0420215f65504623b5d16db0285b050eef2a22ca (diff) | |
| parent | 652a9859988f3f555a1f7e18518656eb9c9332e6 (diff) | |
| download | podman-1438d5471f4cb23493f65b7df3f30fbb95e565cd.tar.gz podman-1438d5471f4cb23493f65b7df3f30fbb95e565cd.tar.bz2 podman-1438d5471f4cb23493f65b7df3f30fbb95e565cd.zip | |
Merge pull request #2059 from rhatdan/ociruntime
podman build is not using the default oci-runtime
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/build.go | 6 |
1 files changed, 5 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, |