diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-16 13:20:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 13:20:30 +0200 |
| commit | 2d47f1ae5425faa6800606092e997bd565dc3a1c (patch) | |
| tree | a661269aa2cf5342247062424b11edf5353e274d /pkg | |
| parent | 14e0b40379a5446fce1f63140dd0e44a0a3e15ec (diff) | |
| parent | a3fd890b8628121b2912398d156a844e9c440ff2 (diff) | |
| download | podman-2d47f1ae5425faa6800606092e997bd565dc3a1c.tar.gz podman-2d47f1ae5425faa6800606092e997bd565dc3a1c.tar.bz2 podman-2d47f1ae5425faa6800606092e997bd565dc3a1c.zip | |
Merge pull request #3796 from giuseppe/enable-cgroupsv2-crun
cirrus: enable cgroups v2 tests with crun
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/adapter/runtime.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/adapter/runtime.go b/pkg/adapter/runtime.go index 03419c0bd..c80d5991e 100644 --- a/pkg/adapter/runtime.go +++ b/pkg/adapter/runtime.go @@ -288,7 +288,11 @@ func (r *LocalRuntime) Build(ctx context.Context, c *cliconfig.BuildValues, opti options.CommonBuildOpts = commonOpts options.SystemContext = systemContext - options.Runtime = r.GetOCIRuntimePath() + if c.GlobalFlags.Runtime != "" { + options.Runtime = c.GlobalFlags.Runtime + } else { + options.Runtime = r.GetOCIRuntimePath() + } if c.Quiet { options.ReportWriter = ioutil.Discard |