summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-12 01:55:59 +0200
committerGitHub <noreply@github.com>2019-08-12 01:55:59 +0200
commit2348c2873f1518b2b39adbfffd19ea295f7457e2 (patch)
tree8abdbd0aa70c08380862e5068dda7a151c8b2127
parent146719718e24864a261ba27a2ad1ad81581de0dd (diff)
parent2aa35d25b3e3c379559d2cb152f59803f7a22dcd (diff)
downloadpodman-2348c2873f1518b2b39adbfffd19ea295f7457e2.tar.gz
podman-2348c2873f1518b2b39adbfffd19ea295f7457e2.tar.bz2
podman-2348c2873f1518b2b39adbfffd19ea295f7457e2.zip
Merge pull request #3785 from giuseppe/podman-build-use-configured-runtime
build: use the configured runtime
-rw-r--r--pkg/adapter/runtime.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go
index 4a3b41297..03419c0bd 100644
--- a/pkg/adapter/runtime.go
+++ b/pkg/adapter/runtime.go
@@ -288,9 +288,8 @@ func (r *LocalRuntime) Build(ctx context.Context, c *cliconfig.BuildValues, opti
options.CommonBuildOpts = commonOpts
options.SystemContext = systemContext
- if c.Flag("runtime").Changed {
- options.Runtime = r.GetOCIRuntimePath()
- }
+ options.Runtime = r.GetOCIRuntimePath()
+
if c.Quiet {
options.ReportWriter = ioutil.Discard
}